diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel
index f52af066e03..65371c89393 100644
--- a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_xunit_test(
     name = "Semmle.Autobuild.CSharp.Tests",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     deps = [
         "//csharp/autobuilder/Semmle.Autobuild.CSharp:bin/Semmle.Autobuild.CSharp",
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.CSharp/BUILD.bazel
index 904edb3ca55..ee232650da6 100644
--- a/csharp/autobuilder/Semmle.Autobuild.CSharp/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.CSharp/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_binary(
     name = "Semmle.Autobuild.CSharp",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     visibility = ["//csharp:__subpackages__"],
     deps = [
diff --git a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel
index 05c41a7dc0c..10c8c6dc96c 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_xunit_test(
     name = "Semmle.Autobuild.Cpp.Tests",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     deps = [
         "//csharp/autobuilder/Semmle.Autobuild.Cpp:bin/Semmle.Autobuild.Cpp",
diff --git a/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
index 379b8aea91d..0d9125cf1ee 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_binary(
     name = "Semmle.Autobuild.Cpp",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     visibility = ["//visibility:public"],
     deps = [
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Shared/BUILD.bazel
index 888a14046da..bc968ff8a4d 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_library(
     name = "Semmle.Autobuild.Shared",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     visibility = ["//visibility:public"],
     deps = [
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
index 670cdb96808..71f54154077 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_library(
     name = "Semmle.Extraction.CSharp.DependencyFetching",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
         "SourceGenerators/**/*.cs",
     ]),
     allow_unsafe_blocks = True,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Properties/AssemblyInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Properties/AssemblyInfo.cs
deleted file mode 100644
index 20cd0374d80..00000000000
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// Expose internals for testing purposes.
-[assembly: InternalsVisibleTo("Semmle.Extraction.Tests")]
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 089615465ca..82003c4dd14 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
@@ -6,6 +6,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
     <ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
+
+    <InternalsVisibleTo Include="Semmle.Extraction.Tests" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/BUILD.bazel
index 56376804aba..c12457650c2 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_binary(
     name = "Semmle.Extraction.CSharp.DependencyStubGenerator",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     visibility = ["//csharp:__pkg__"],
     deps = [
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Driver/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.Driver/BUILD.bazel
index a32dc3a3765..1689f452004 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Driver/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Driver/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_binary(
     name = "Semmle.Extraction.CSharp.Driver",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     visibility = ["//csharp:__pkg__"],
     deps = [
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BUILD.bazel
index 4d375f5cdc6..99b75e60737 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_binary(
     name = "Semmle.Extraction.CSharp.Standalone",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     visibility = ["//csharp:__subpackages__"],
     deps = [
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel
index 856a7a402e8..563168cdf48 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_csharp_library(
     name = "Semmle.Extraction.CSharp.StubGenerator",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     internals_visible_to = ["Semmle.Extraction.Tests"],
     visibility = ["//csharp:__subpackages__"],
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Properties/AssemblyInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Properties/AssemblyInfo.cs
deleted file mode 100644
index 20cd0374d80..00000000000
--- a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// Expose internals for testing purposes.
-[assembly: InternalsVisibleTo("Semmle.Extraction.Tests")]
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Semmle.Extraction.CSharp.StubGenerator.csproj b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Semmle.Extraction.CSharp.StubGenerator.csproj
index d0d57ba0144..e0076e4abdc 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Semmle.Extraction.CSharp.StubGenerator.csproj
+++ b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Semmle.Extraction.CSharp.StubGenerator.csproj
@@ -4,6 +4,8 @@
 		<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
 		<ProjectReference Include="..\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
 		<ProjectReference Include="..\Semmle.Extraction.CSharp.Util\Semmle.Extraction.CSharp.Util.csproj" />
+
+		<InternalsVisibleTo Include="Semmle.Extraction.Tests" />
 	</ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Util/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.Util/BUILD.bazel
index f3baa5334c0..fae678c81e6 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Util/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Util/BUILD.bazel
@@ -6,7 +6,6 @@ load(
 codeql_csharp_library(
     name = "Semmle.Extraction.CSharp.Util",
     srcs = glob([
-        "Properties/*.cs",
         "*.cs",
     ]),
     visibility = ["//csharp:__subpackages__"],
diff --git a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
index fc32731c094..dfdf41150ea 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_xunit_test(
     name = "Semmle.Extraction.Tests",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     deps = [
         "//csharp/extractor/Semmle.Extraction",
diff --git a/csharp/extractor/Semmle.Extraction/BUILD.bazel b/csharp/extractor/Semmle.Extraction/BUILD.bazel
index 1e841814d93..de3a6c2d96a 100644
--- a/csharp/extractor/Semmle.Extraction/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction/BUILD.bazel
@@ -15,7 +15,6 @@ codeql_csharp_library(
     srcs = glob([
         "Entities/**/*.cs",
         "Extractor/**/*.cs",
-        "Properties/*.cs",
         "*.cs",
     ]),
     # enable via -c dbg on the bazel command line/in .bazelrc.local
diff --git a/csharp/extractor/Semmle.Util.Tests/BUILD.bazel b/csharp/extractor/Semmle.Util.Tests/BUILD.bazel
index d2a57e1a31a..6c3fb64e662 100644
--- a/csharp/extractor/Semmle.Util.Tests/BUILD.bazel
+++ b/csharp/extractor/Semmle.Util.Tests/BUILD.bazel
@@ -7,7 +7,6 @@ codeql_xunit_test(
     name = "Semmle.Util.Tests",
     srcs = glob([
         "*.cs",
-        "Properties/*.cs",
     ]),
     deps = [
         "//csharp/extractor/Semmle.Util",
diff --git a/csharp/extractor/Semmle.Util/BUILD.bazel b/csharp/extractor/Semmle.Util/BUILD.bazel
index a13928c48e6..6a0b38762cf 100644
--- a/csharp/extractor/Semmle.Util/BUILD.bazel
+++ b/csharp/extractor/Semmle.Util/BUILD.bazel
@@ -9,7 +9,6 @@ codeql_csharp_library(
         "Logging/**/*.cs",
         "ToolStatusPage/**/*.cs",
         "*.cs",
-        "Properties/*.cs",
     ]),
     visibility = ["//visibility:public"],
     deps = [