From e7844e2855da2accbe508d328ed165eef776d024 Mon Sep 17 00:00:00 2001 From: Tamas Vajk Date: Wed, 13 Nov 2024 13:47:40 +0100 Subject: [PATCH] C#: Remove Semmle.Extraction project and move content to Semmle.Extraction.CSharp --- csharp/CSharp.sln | 2 -- .../BUILD.bazel | 2 +- .../NugetExeWrapper.cs | 4 +-- ...xtraction.CSharp.DependencyFetching.csproj | 2 +- .../Semmle.Extraction.CSharp/BUILD.bazel | 2 +- .../Semmle.Extraction.CSharp.csproj | 1 - .../_Base}/AssemblyScope.cs | 0 .../_Base}/Context.cs | 0 .../_Base}/CsProjFile.cs | 0 .../Entities/Base/CachedEntityFactory.cs | 0 .../Base/CachedEntityFactoryExtensions.cs | 0 .../_Base}/Entities/Base/CachedEntity`1.cs | 0 .../_Base}/Entities/Base/Entity.cs | 0 .../_Base}/Entities/Base/FreshEntity.cs | 0 .../_Base}/Entities/Base/IEntity.cs | 0 .../_Base}/Entities/Base/LabelledEntity.cs | 0 .../_Base}/Entities/Base/UnlabelledEntity.cs | 0 .../_Base}/Entities/ExtractionMessage.cs | 0 .../_Base}/Entities/File.cs | 0 .../_Base}/Entities/Folder.cs | 0 .../_Base}/Entities/GeneratedFile.cs | 0 .../_Base}/Entities/GeneratedLocation.cs | 0 .../_Base}/Entities/Location.cs | 0 .../_Base}/Entities/SourceLocation.cs | 0 .../_Base}/EscapingTextWriter.cs | 0 .../Extractor/BinaryLogExtractionContext.cs | 0 .../_Base}/Extractor/ExtractionContext.cs | 0 .../_Base}/Extractor/ExtractorMode.cs | 0 .../_Base}/FilePattern.cs | 0 .../_Base}/IExtractionScope.cs | 0 .../_Base}/Id.cs | 0 .../_Base}/InternalError.cs | 0 .../_Base}/LocationExtensions.cs | 0 .../_Base}/Message.cs | 0 .../_Base}/Options.cs | 0 .../_Base}/PathTransformer.cs | 0 .../_Base}/SourceScope.cs | 0 .../_Base}/TrapExtensions.cs | 0 .../_Base}/TrapStackBehaviour.cs | 0 .../_Base}/TrapWriter.cs | 0 .../_Base}/Tuple.cs | 0 .../_Base}/Tuples.cs | 0 .../Semmle.Extraction.Tests/BUILD.bazel | 1 - .../Semmle.Extraction.Tests.csproj | 1 - .../extractor/Semmle.Extraction/BUILD.bazel | 36 ------------------- .../Semmle.Extraction.csproj | 12 ------- .../Semmle.Extraction.ruleset | 12 ------- .../Semmle.Extraction/paket.references | 2 -- 48 files changed, 5 insertions(+), 72 deletions(-) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/AssemblyScope.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Context.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/CsProjFile.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/CachedEntityFactory.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/CachedEntityFactoryExtensions.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/CachedEntity`1.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/Entity.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/FreshEntity.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/IEntity.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/LabelledEntity.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Base/UnlabelledEntity.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/ExtractionMessage.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/File.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Folder.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/GeneratedFile.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/GeneratedLocation.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/Location.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Entities/SourceLocation.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/EscapingTextWriter.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Extractor/BinaryLogExtractionContext.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Extractor/ExtractionContext.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Extractor/ExtractorMode.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/FilePattern.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/IExtractionScope.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Id.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/InternalError.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/LocationExtensions.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Message.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Options.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/PathTransformer.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/SourceScope.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/TrapExtensions.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/TrapStackBehaviour.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/TrapWriter.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Tuple.cs (100%) rename csharp/extractor/{Semmle.Extraction => Semmle.Extraction.CSharp/_Base}/Tuples.cs (100%) delete mode 100644 csharp/extractor/Semmle.Extraction/BUILD.bazel delete mode 100644 csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj delete mode 100644 csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset delete mode 100644 csharp/extractor/Semmle.Extraction/paket.references diff --git a/csharp/CSharp.sln b/csharp/CSharp.sln index dddba01c6ed3..f4cde4624d45 100644 --- 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 index 71f541540779..4be9954a2740 100644 --- 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 index 0676042eb42f..c77daa8899c8 100644 --- 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 /// /// Create the package manager for a specified source tree. /// - 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/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj index 82003c4dd142..424094c1ed6e 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj @@ -5,7 +5,7 @@ - + diff --git a/csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel index f5d36340bd63..0d15114bf814 100644 --- 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 index 00a84ec3627a..3794d25df50c 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj +++ b/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj @@ -1,7 +1,6 @@ - diff --git a/csharp/extractor/Semmle.Extraction/AssemblyScope.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/AssemblyScope.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/AssemblyScope.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/AssemblyScope.cs diff --git a/csharp/extractor/Semmle.Extraction/Context.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Context.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Context.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Context.cs diff --git a/csharp/extractor/Semmle.Extraction/CsProjFile.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/CsProjFile.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/CsProjFile.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/CsProjFile.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactory.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/CachedEntityFactory.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactory.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/CachedEntityFactory.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactoryExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/CachedEntityFactoryExtensions.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactoryExtensions.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/CachedEntityFactoryExtensions.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntity`1.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/CachedEntity`1.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntity`1.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/CachedEntity`1.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/Entity.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/Entity.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/Entity.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/Entity.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/FreshEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/FreshEntity.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/FreshEntity.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/FreshEntity.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/IEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/IEntity.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/IEntity.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/IEntity.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/LabelledEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/LabelledEntity.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/LabelledEntity.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/LabelledEntity.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/UnlabelledEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/UnlabelledEntity.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Base/UnlabelledEntity.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Base/UnlabelledEntity.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/ExtractionMessage.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/ExtractionMessage.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/ExtractionMessage.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/ExtractionMessage.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/File.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/File.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/File.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/File.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Folder.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Folder.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Folder.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Folder.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/GeneratedFile.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/GeneratedFile.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/GeneratedLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/GeneratedLocation.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/GeneratedLocation.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/GeneratedLocation.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/Location.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Location.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/Location.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/Location.cs diff --git a/csharp/extractor/Semmle.Extraction/Entities/SourceLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/SourceLocation.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Entities/SourceLocation.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Entities/SourceLocation.cs diff --git a/csharp/extractor/Semmle.Extraction/EscapingTextWriter.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/EscapingTextWriter.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/EscapingTextWriter.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/EscapingTextWriter.cs diff --git a/csharp/extractor/Semmle.Extraction/Extractor/BinaryLogExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Extractor/BinaryLogExtractionContext.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Extractor/BinaryLogExtractionContext.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Extractor/BinaryLogExtractionContext.cs diff --git a/csharp/extractor/Semmle.Extraction/Extractor/ExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Extractor/ExtractionContext.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Extractor/ExtractionContext.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Extractor/ExtractionContext.cs diff --git a/csharp/extractor/Semmle.Extraction/Extractor/ExtractorMode.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Extractor/ExtractorMode.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Extractor/ExtractorMode.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Extractor/ExtractorMode.cs diff --git a/csharp/extractor/Semmle.Extraction/FilePattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/FilePattern.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/FilePattern.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/FilePattern.cs diff --git a/csharp/extractor/Semmle.Extraction/IExtractionScope.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/IExtractionScope.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/IExtractionScope.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/IExtractionScope.cs diff --git a/csharp/extractor/Semmle.Extraction/Id.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Id.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Id.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Id.cs diff --git a/csharp/extractor/Semmle.Extraction/InternalError.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/InternalError.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/InternalError.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/InternalError.cs diff --git a/csharp/extractor/Semmle.Extraction/LocationExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/LocationExtensions.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/LocationExtensions.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/LocationExtensions.cs diff --git a/csharp/extractor/Semmle.Extraction/Message.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Message.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Message.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Message.cs diff --git a/csharp/extractor/Semmle.Extraction/Options.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Options.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Options.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Options.cs diff --git a/csharp/extractor/Semmle.Extraction/PathTransformer.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/PathTransformer.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/PathTransformer.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/PathTransformer.cs diff --git a/csharp/extractor/Semmle.Extraction/SourceScope.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/SourceScope.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/SourceScope.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/SourceScope.cs diff --git a/csharp/extractor/Semmle.Extraction/TrapExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/TrapExtensions.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/TrapExtensions.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/TrapExtensions.cs diff --git a/csharp/extractor/Semmle.Extraction/TrapStackBehaviour.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/TrapStackBehaviour.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/TrapStackBehaviour.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/TrapStackBehaviour.cs diff --git a/csharp/extractor/Semmle.Extraction/TrapWriter.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/TrapWriter.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/TrapWriter.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/TrapWriter.cs diff --git a/csharp/extractor/Semmle.Extraction/Tuple.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Tuple.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Tuple.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Tuple.cs diff --git a/csharp/extractor/Semmle.Extraction/Tuples.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Tuples.cs similarity index 100% rename from csharp/extractor/Semmle.Extraction/Tuples.cs rename to csharp/extractor/Semmle.Extraction.CSharp/_Base/Tuples.cs diff --git a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel index dfdf41150ea8..df9799d3f959 100644 --- 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 index 60994237e152..d3940eb3df9f 100644 --- a/csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj +++ b/csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj @@ -4,7 +4,6 @@ - diff --git a/csharp/extractor/Semmle.Extraction/BUILD.bazel b/csharp/extractor/Semmle.Extraction/BUILD.bazel deleted file mode 100644 index 83dfb8235e88..000000000000 --- a/csharp/extractor/Semmle.Extraction/BUILD.bazel +++ /dev/null @@ -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", - ], -) diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj deleted file mode 100644 index 2173a50f2ad3..000000000000 --- a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Semmle.Extraction.ruleset - - - - - - - - diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset deleted file mode 100644 index 14df29e3653b..000000000000 --- a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/csharp/extractor/Semmle.Extraction/paket.references b/csharp/extractor/Semmle.Extraction/paket.references deleted file mode 100644 index 310fffb853f1..000000000000 --- a/csharp/extractor/Semmle.Extraction/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -Microsoft.Build -Microsoft.CodeAnalysis