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

Merge pull request #14991 from tamasvajk/standalone/prefer-assembly-version-over-netcore-version

Browse Source 
C#: Prefer assembly version over netcore version in conflict resolution
This commit is contained in:
Tamás Vajk
2023-12-05 08:49:08 +01:00
committed by GitHub
parent 6dd941ee20 267125a65e
commit b06113a21e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCacheExtensions.cs
View File

@@ -9,7 +9,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
private static readonly Version emptyVersion = new Version(0, 0, 0, 0);
/// <summary>
/// This method orders AssemblyInfos by version numbers (.net core version first, then assembly version). Finally, it orders by filename to make the order deterministic.
/// This method orders AssemblyInfos. The method is used to define the assembly preference order in case of conflicts.
/// </summary>
public static IOrderedEnumerable<AssemblyInfo> OrderAssemblyInfosByPreference(this IEnumerable<AssemblyInfo> assemblies, IEnumerable<string> frameworkPaths)
{
@@ -21,8 +21,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
: assemblies.OrderBy(initialOrdering);
return ordered
.ThenBy(info => info.NetCoreVersion ?? emptyVersion)
.ThenBy(info => info.Version ?? emptyVersion)
.ThenBy(info => info.NetCoreVersion ?? emptyVersion)
.ThenBy(info => info.Filename);
}
}