Merge pull request #16776 from tamasvajk/fix/source-generator-folder

C#: Make sure no file is added twice to the compilation

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs

@@ -398,7 +398,7 @@ public static IEnumerable<Action> ReadSyntaxTrees(IEnumerable<string> sources, A
                     }
 
                     return ReadSyntaxTrees(
-                        paths.Select(analyser.PathCache.GetCanonicalPath),
+                        paths.Select(analyser.PathCache.GetCanonicalPath).ToHashSet(),
                         analyser,
                         compilerArguments.ParseOptions,
                         compilerArguments.Encoding,

csharp/ql/integration-tests/all-platforms/source_generator/Diag.ql

@@ -0,0 +1,4 @@
+import csharp
+import semmle.code.csharp.commons.Diagnostics
+
+query predicate test2(CompilerError e) { any() }

csharp/ql/integration-tests/all-platforms/source_generator/Files.expected

@@ -0,0 +1,6 @@
+| Generated/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | Generated/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
+| Generated/x.cs:0:0:0:0 | Generated/x.cs |
+| Program.cs:0:0:0:0 | Program.cs |
+| obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
+| obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net8.0/test.AssemblyInfo.cs |
+| obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net8.0/test.GlobalUsings.g.cs |

csharp/ql/integration-tests/all-platforms/source_generator/Files.ql

@@ -0,0 +1,5 @@
+import csharp
+
+from File f
+where f.fromSource()
+select f

csharp/ql/integration-tests/all-platforms/source_generator/Generated/x.cs

@@ -0,0 +1,4 @@
+// File added to the Generated folder. This is not a source generator output file.
+class X
+{
+}

csharp/ql/integration-tests/all-platforms/source_generator/Program.cs

@@ -0,0 +1,9 @@
+using System.Text.RegularExpressions;
+
+Console.WriteLine("Hello, World!");
+
+partial class Test
+{
+    [GeneratedRegex("abc|def", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex AbcOrDefGeneratedRegex();
+}

csharp/ql/integration-tests/all-platforms/source_generator/global.json

@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "8.0.101"
+    }
+}

csharp/ql/integration-tests/all-platforms/source_generator/test.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <!-- Add source generated files into the Generated folder. -->
+    <CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
+  </PropertyGroup>
+
+</Project>

csharp/ql/integration-tests/all-platforms/source_generator/test.py

@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create(['dotnet build'], lang="csharp")