C#: Address review comments.

michaelnebel · michaelnebel · commit 0cb3b7b1a8dd · 2025-10-21T12:56:18.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs
@@ -75,7 +75,7 @@ public CompilerVersion(Options options)
                 }
 
                 // If csc is specified as compiler name, then attempt to read the version information from csc.dll
-                var compilerBinaryName = SpecifiedCompiler.EndsWith("csc") ? $"{SpecifiedCompiler}.dll" : SpecifiedCompiler;
+                var compilerBinaryName = Path.GetFileName(SpecifiedCompiler) == "csc" ? $"{SpecifiedCompiler}.dll" : SpecifiedCompiler;
                 var versionInfo = FileVersionInfo.GetVersionInfo(compilerBinaryName);
                 if (!knownCompilerNames.TryGetValue(versionInfo.OriginalFilename ?? string.Empty, out var vendor))
                 {
diff --git a/csharp/ql/lib/semmle/code/csharp/Callable.qll b/csharp/ql/lib/semmle/code/csharp/Callable.qll
@@ -13,6 +13,8 @@ private import semmle.code.csharp.ExprOrStmtParent
 private import semmle.code.csharp.metrics.Complexity
 private import TypeRef
 
+private predicate myTest(Callable c) { c.fromSource() }
+
 /**
  * An element that can be called.
  *

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public CompilerVersion(Options options)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`// If csc is specified as compiler name, then attempt to read the version information from csc.dll`
`78`		`- var compilerBinaryName = SpecifiedCompiler.EndsWith("csc") ? $"{SpecifiedCompiler}.dll" : SpecifiedCompiler;`
	`78`	`+ var compilerBinaryName = Path.GetFileName(SpecifiedCompiler) == "csc" ? $"{SpecifiedCompiler}.dll" : SpecifiedCompiler;`
`79`	`79`	`var versionInfo = FileVersionInfo.GetVersionInfo(compilerBinaryName);`
`80`	`80`	`if (!knownCompilerNames.TryGetValue(versionInfo.OriginalFilename ?? string.Empty, out var vendor))`
`81`	`81`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ private import semmle.code.csharp.ExprOrStmtParent`
`13`	`13`	`private import semmle.code.csharp.metrics.Complexity`
`14`	`14`	`private import TypeRef`
`15`	`15`
	`16`	`+private predicate myTest(Callable c) { c.fromSource() }`
	`17`	`+`
`16`	`18`	`/**`
`17`	`19`	`* An element that can be called.`
`18`	`20`	`*`