hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15600 from tamasvajk/buildless/no-mono-dlls

Browse Source 
C# Change desktop dotnet assembly lookup to fall back to nuget reference assemblies
This commit is contained in:
Tamás Vajk
2024-02-21 08:36:41 +01:00
committed by GitHub
parent f2e04c0cb2 216d6c0827
commit 70a2d16b1a
21 changed files with 228 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/test.py
View File

@@ -1,5 +1,5 @@
import os
from create_database_utils import *
os.environ['CODEQL_EXTRACTOR_CSHARP_STANDALONE_EXTRACT_WEB_VIEWS'] = 'false'
os.environ['CODEQL_EXTRACTOR_CSHARP_BUILDLESS_EXTRACT_WEB_VIEWS'] = 'false'
run_codeql_database_create(lang="csharp", extra_args=["--extractor-option=buildless=true"])

1
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.expected Normal file
View File

@@ -0,0 +1 @@
| /packages/newtonsoft.json/6.0.4/lib/net45/Newtonsoft.Json.dll |

15
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.ql Normal file
View File

@@ -0,0 +1,15 @@
import csharp
private string getPath(Assembly a) {
not a.getCompilation().getOutputAssembly() = a and
exists(string s | s = a.getFile().getAbsolutePath() |
result =
s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16, s.length())
or
result = s and
not exists(s.indexOf("test-db/working/"))
)
}
from Assembly a
select getPath(a)

6
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Program.cs Normal file
View File

@@ -0,0 +1,6 @@
class Program
{
static void Main(string[] args)
{
}
}

5
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/global.json Normal file
View File

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

5
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/packages.config Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net461" />
<package id="NUnit.ConsoleRunner" version="3.12.0" />
</packages>

1
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/skip-on-platform-osx-arm Normal file
View File

@@ -0,0 +1 @@
Skipping the test on the ARM runners, as we're running into trouble with Mono and nuget.

5
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/test.py Normal file
View File

@@ -0,0 +1,5 @@
from create_database_utils import *
import os
os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_DOTNET_FRAMEWORK_REFERENCES"] = "/non-existent-path"
run_codeql_database_create([], lang="csharp", extra_args=["--extractor-option=buildless=true"])

4
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/test_old.csproj Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

16
csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/test_sdk.csproj Normal file
View File

@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
<RemoveDir Directories=".\bin" />
<RemoveDir Directories=".\obj" />
</Target>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="6.0.4" />
</ItemGroup>
</Project>