Merge pull request #12942 from github/henrymercer/update-diagnostics-integration-tests

C#: Update diagnostics integration tests

csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/diagnostics.expected

@@ -1,7 +1,4 @@
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL found some projects which cannot be built with .NET Core:\n\n- `test.csproj`",
   "severity": "warning",
   "source": {
@@ -16,9 +13,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL was unable to build the following projects using MSBuild:\n\n- `test.csproj`\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {

csharp/ql/integration-tests/all-platforms/diag_missing_project_files/diagnostics.expected

@@ -1,7 +1,4 @@
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL was unable to build the following projects using MSBuild:\n\n- `test.sln`\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {
@@ -16,9 +13,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "Some project files were not found when CodeQL built your project:\n\n- `Example.csproj`\n- `Example.Test.csproj`\n\nThis may lead to subsequent failures. You can check for common causes for missing project files:\n\n- Ensure that the project is built using the [intended operating system](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on) and that filenames on case-sensitive platforms are correctly specified.\n- If your repository uses Git submodules, ensure that those are [checked out](https://github.com/actions/checkout#usage) before the CodeQL Action is run.\n- If you auto-generate some project files as part of your build process, ensure that these are generated before the CodeQL Action is run.",
   "severity": "error",
   "source": {

csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/diagnostics.expected

@@ -1,7 +1,4 @@
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL was unable to build the following projects using .NET Core:\n\n- `test.csproj`\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {
@@ -16,9 +13,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL was unable to build the following projects using MSBuild:\n\n- `test.csproj`\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {
@@ -33,9 +27,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "[Configure your workflow](https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-xamarin-applications) for this SDK before running CodeQL.",
   "severity": "error",
   "source": {

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

@@ -1,4 +1,3 @@
-import os
 from create_database_utils import *
 from diagnostics_test_utils import *
 
@@ -22,35 +21,35 @@ check_diagnostics()
 # no arguments, but `--`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test-db', 'dotnet run --'], "test2-db")
 check_build_out("Default reply", s)
-check_diagnostics(diagnostics_dir="test2-db/diagnostic")
+check_diagnostics(test_db="test2-db")
 
 # one argument, no `--`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test2-db', 'dotnet run hello'], "test3-db")
 check_build_out("Default reply", s)
-check_diagnostics(diagnostics_dir="test3-db/diagnostic")
+check_diagnostics(test_db="test3-db")
 
 # one argument, but `--`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test3-db', 'dotnet run -- hello'], "test4-db")
 check_build_out("Default reply", s)
-check_diagnostics(diagnostics_dir="test4-db/diagnostic")
+check_diagnostics(test_db="test4-db")
 
 # two arguments, no `--`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test4-db', 'dotnet run hello world'], "test5-db")
 check_build_out("hello, world", s)
-check_diagnostics(diagnostics_dir="test5-db/diagnostic")
+check_diagnostics(test_db="test5-db")
 
 # two arguments, and `--`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test5-db', 'dotnet run -- hello world'], "test6-db")
 check_build_out("hello, world", s)
-check_diagnostics(diagnostics_dir="test6-db/diagnostic")
+check_diagnostics(test_db="test6-db")
 
 # shared compilation enabled; tracer should override by changing the command
 # to `dotnet run -p:UseSharedCompilation=true -p:UseSharedCompilation=false -- hello world`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test6-db', 'dotnet run -p:UseSharedCompilation=true -- hello world'], "test7-db")
 check_build_out("hello, world", s)
-check_diagnostics(diagnostics_dir="test7-db/diagnostic")
+check_diagnostics(test_db="test7-db")
 
 # option passed into `dotnet run`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test7-db', 'dotnet build', 'dotnet run --no-build hello world'], "test8-db")
 check_build_out("hello, world", s)
-check_diagnostics(diagnostics_dir="test8-db/diagnostic")
+check_diagnostics(test_db="test8-db")

csharp/ql/integration-tests/posix-only/diag_autobuild_script/diagnostics.expected

@@ -1,7 +1,4 @@
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL attempted to build your project using a script located at `build.sh`, which failed.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {
@@ -16,9 +13,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL could not find any project or solution files in your repository.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {

csharp/ql/integration-tests/posix-only/diag_multiple_scripts/diagnostics.expected

@@ -1,7 +1,4 @@
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL could not find any project or solution files in your repository.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {
@@ -16,9 +13,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL found multiple potential build scripts for your project and attempted to run `build.sh`, which failed. This may not be the right build script for your project.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {

csharp/ql/integration-tests/windows-only/diag_autobuild_script/diagnostics.expected

@@ -1,7 +1,4 @@
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL attempted to build your project using a script located at `build.bat`, which failed.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {
@@ -16,9 +13,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL could not find any project or solution files in your repository.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {

csharp/ql/integration-tests/windows-only/diag_multiple_scripts/diagnostics.expected

@@ -1,7 +1,4 @@
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL could not find any project or solution files in your repository.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {
@@ -16,9 +13,6 @@
   }
 }
 {
-  "attributes": {},
-  "helpLinks": [],
-  "internal": false,
   "markdownMessage": "CodeQL found multiple potential build scripts for your project and attempted to run `build.bat`, which failed. This may not be the right build script for your project.\n\nSet up a [manual build command](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages).",
   "severity": "error",
   "source": {