Merge pull request #16310 from tamasvajk/buildless/nuget_versions

C#: Add integration test with multiple versions of the same nuget pac…
github · Apr 24, 2024 · 84ea3a9 · 84ea3a9
2 parents f828f8e + 53eb753
commit 84ea3a9
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 0 deletions.
diff --git a/...l/integration-tests/posix-only/standalone_dependencies_nuget_versions/Assemblies.expected b/...l/integration-tests/posix-only/standalone_dependencies_nuget_versions/Assemblies.expected
@@ -0,0 +1 @@
+| [...]/newtonsoft.json/13.0.1/lib/netstandard2.0/Newtonsoft.Json.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/Assemblies.ql
@@ -0,0 +1,18 @@
+import csharp
+
+private string getPath(Assembly a) {
+  not a.getCompilation().getOutputAssembly() = a and
+  exists(string s | s = a.getFile().getAbsolutePath() |
+    exists(result.indexOf("Newtonsoft.Json")) and
+    result =
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/packages".length(), s.length())
+    or
+    result = s and
+    not exists(s.indexOf("test-db/working/"))
+  )
+}
+
+from Assembly a
+select getPath(a)
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/Program.cs b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/Program.cs
@@ -0,0 +1,6 @@
+class Program
+{
+    static void Main(string[] args)
+    {
+    }
+}
diff --git a/...rp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/d1/test1.csproj b/...rp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/d1/test1.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
+    <RemoveDir Directories=".\bin" />
+    <RemoveDir Directories=".\obj" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="8.0.1" />
+  </ItemGroup>
+</Project>
diff --git a/...rp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/d2/test2.csproj b/...rp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/d2/test2.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
+    <RemoveDir Directories=".\bin" />
+    <RemoveDir Directories=".\obj" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+</Project>
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/global.json b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "8.0.101"
+    }
+}
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/test.py b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_versions/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create([], lang="csharp", extra_args=["--build-mode=none"])
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		\| [...]/newtonsoft.json/13.0.1/lib/netstandard2.0/Newtonsoft.Json.dll \|
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from create_database_utils import *

		run_codeql_database_create([], lang="csharp", extra_args=["--build-mode=none"])