Merge pull request #20663 from michaelnebel/csharp/dotnet10rc2traced

michaelnebel · web-flow · commit 83343e1031a8 · 2025-10-22T15:36:34.000+02:00
C#: Tracer support for invoking `csc` directly.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs
@@ -74,7 +74,9 @@ public CompilerVersion(Options options)
                     specifiedFramework = compilerDir;
                 }
 
-                var versionInfo = FileVersionInfo.GetVersionInfo(SpecifiedCompiler);
+                // If csc is specified as compiler name, then attempt to read the version information from csc.dll
+                var compilerBinaryName = Path.GetFileName(SpecifiedCompiler) == "csc" ? $"{SpecifiedCompiler}.dll" : SpecifiedCompiler;
+                var versionInfo = FileVersionInfo.GetVersionInfo(File.Exists(compilerBinaryName) ? compilerBinaryName : SpecifiedCompiler);
                 if (!knownCompilerNames.TryGetValue(versionInfo.OriginalFilename ?? string.Empty, out var vendor))
                 {
                     SkipExtractionBecause("the compiler name is not recognised");
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/Program.cs b/csharp/ql/integration-tests/linux/dotnet_10_rc2/Program.cs
@@ -0,0 +1 @@
+﻿Console.WriteLine($"<arguments>{string.Join(",", args)}</arguments>");
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/dotnet_build.csproj b/csharp/ql/integration-tests/linux/dotnet_10_rc2/dotnet_build.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/global.json b/csharp/ql/integration-tests/linux/dotnet_10_rc2/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "10.0.100-rc.2.25502.107"
+    }
+}
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/test.py b/csharp/ql/integration-tests/linux/dotnet_10_rc2/test.py
@@ -0,0 +1,6 @@
+import os
+import runs_on
+
+@runs_on.linux
+def test(codeql, csharp):
+    codeql.database.create()
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/Program.cs b/csharp/ql/integration-tests/windows/dotnet_10_rc2/Program.cs
@@ -0,0 +1 @@
+﻿Console.WriteLine($"<arguments>{string.Join(",", args)}</arguments>");
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/dotnet_build.csproj b/csharp/ql/integration-tests/windows/dotnet_10_rc2/dotnet_build.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/global.json b/csharp/ql/integration-tests/windows/dotnet_10_rc2/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "10.0.100-rc.2.25502.107"
+    }
+}
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/test.py b/csharp/ql/integration-tests/windows/dotnet_10_rc2/test.py
@@ -0,0 +1,6 @@
+import os
+import runs_on
+
+@runs_on.windows
+def test(codeql, csharp):
+    codeql.database.create()
diff --git a/csharp/ql/lib/change-notes/2025-10-21-dotnet-rc2-tracing.md b/csharp/ql/lib/change-notes/2025-10-21-dotnet-rc2-tracing.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added tracer support for macOS and Linux when the .NET CLI (`dotnet`) directly invokes the C# compiler (`csc`). This enhancement provides basic tracing and extraction capabilities for .NET 10 RC2 on these platforms.
diff --git a/csharp/tools/tracing-config.lua b/csharp/tools/tracing-config.lua
@@ -221,9 +221,9 @@ function RegisterExtractorPack(id)
     }
     local posixMatchers = {
         DotnetMatcherBuild,
-        CreatePatternMatcher({ '^mcs%.exe$', '^csc%.exe$' }, MatchCompilerName,
+        CreatePatternMatcher({ '^mcs%.exe$', '^csc%.exe$', '^csc$' }, MatchCompilerName,
             extractor, {
-            prepend = { '--compiler', '"${compiler}"' },
+            prepend = { '--compiler', '${compiler}' },
             order = ORDER_BEFORE
         }),
         MsBuildMatcher,

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ public CompilerVersion(Options options)`
`74`	`74`	`specifiedFramework = compilerDir;`
`75`	`75`	`}`
`76`	`76`
`77`		`- var versionInfo = FileVersionInfo.GetVersionInfo(SpecifiedCompiler);`
	`77`	`+ // If csc is specified as compiler name, then attempt to read the version information from csc.dll`
	`78`	`+ var compilerBinaryName = Path.GetFileName(SpecifiedCompiler) == "csc" ? $"{SpecifiedCompiler}.dll" : SpecifiedCompiler;`
	`79`	`+ var versionInfo = FileVersionInfo.GetVersionInfo(File.Exists(compilerBinaryName) ? compilerBinaryName : SpecifiedCompiler);`
`78`	`80`	`if (!knownCompilerNames.TryGetValue(versionInfo.OriginalFilename ?? string.Empty, out var vendor))`
`79`	`81`	`{`
`80`	`82`	`SkipExtractionBecause("the compiler name is not recognised");`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Console.WriteLine($"<arguments>{string.Join(",", args)}</arguments>");`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "sdk": {
 +        "version": "10.0.100-rc.2.25502.107"
 +    }
 +}