Merge pull request #13387 from michaelnebel/csharp/dotnettest

C#: Dotnet test tracer improvements.

Author: hvitved

csharp/ql/integration-tests/posix-only/dotnet_test/test.py

@@ -1,5 +1,10 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-run_codeql_database_create(['dotnet test'], db=None, lang="csharp")
+# Implicitly build and then run tests.
+run_codeql_database_create(['dotnet test'], test_db="test-db", lang="csharp")
 check_diagnostics()
+
+# Explicitly build and then run tests.
+run_codeql_database_create(['dotnet clean', 'rm -rf test-db', 'dotnet build -o myout', 'dotnet test myout/dotnet_test.dll'], test_db="test2-db", lang="csharp")
+check_diagnostics(test_db="test2-db")

csharp/ql/integration-tests/posix-only/dotnet_test_mstest/UnitTest1.cs

@@ -0,0 +1,10 @@
+namespace dotnet_test_mstest;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestMethod1()
+    {
+    }
+}

csharp/ql/integration-tests/posix-only/dotnet_test_mstest/Usings.cs

@@ -0,0 +1 @@
+global using Microsoft.VisualStudio.TestTools.UnitTesting;

csharp/ql/integration-tests/posix-only/dotnet_test_mstest/dotnet_test_mstest.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+  </ItemGroup>
+
+</Project>

csharp/ql/integration-tests/posix-only/dotnet_test_mstest/test.py

@@ -0,0 +1,10 @@
+from create_database_utils import *
+from diagnostics_test_utils import *
+
+# Implicitly build and then run tests.
+run_codeql_database_create(['dotnet test'], test_db="test-db", lang="csharp")
+check_diagnostics()
+
+# Explicitly build and then run tests.
+run_codeql_database_create(['dotnet clean', 'rm -rf test-db', 'dotnet build -o myout --os win', 'dotnet test myout/dotnet_test_mstest.exe'], test_db="test2-db", lang="csharp")
+check_diagnostics(test_db="test2-db")

csharp/ql/lib/change-notes/2023-06-06-dotnettest.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* C#: Analysis of the `dotnet test` command supplied with a `dll` or `exe` file as argument no longer fails due to the addition of an erroneous `-p:SharedCompilation=false` argument.

csharp/tools/tracing-config.lua

@@ -21,6 +21,7 @@ function RegisterExtractorPack(id)
         -- if that's `build`, we append `-p:UseSharedCompilation=false` to the command line,
         -- otherwise we do nothing.
         local match = false
+        local testMatch = false
         local dotnetRunNeedsSeparator = false;
         local dotnetRunInjectionIndex = nil;
         local argv = compilerArguments.argv
@@ -37,7 +38,7 @@ function RegisterExtractorPack(id)
                 if (not match) then
                     Log(1, 'Dotnet subcommand detected: %s', arg)
                 end
-                if arg == 'build' or arg == 'msbuild' or arg == 'publish' or arg == 'pack' or arg == 'test' then
+                if arg == 'build' or arg == 'msbuild' or arg == 'publish' or arg == 'pack' then
                     match = true
                     break
                 end
@@ -48,6 +49,16 @@ function RegisterExtractorPack(id)
                     dotnetRunNeedsSeparator = true
                     dotnetRunInjectionIndex = i + 1
                 end
+                if arg == 'test' then
+                    match = true
+                    testMatch = true
+                end
+                -- for `dotnet test`, we should not append `-p:UseSharedCompilation=false` to the command line
+                -- if an `exe` or `dll` is passed as an argument as the call is forwarded to vstest.
+                if testMatch and (arg:match('%.exe$') or arg:match('%.dll'))  then
+                    match = false
+                    break
+                end
             end
             -- if we see a separator to `dotnet run`, inject just prior to the existing separator
             if arg == '--' then