C#: Prefer assembly version over netcore version in conflict resolution

tamasvajk · tamasvajk · commit 6f82e634613f · 2023-12-04T11:08:33.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCacheExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCacheExtensions.cs
@@ -21,8 +21,8 @@ public static IOrderedEnumerable<AssemblyInfo> OrderAssemblyInfosByPreference(th
                 : assemblies.OrderBy(initialOrdering);
 
             return ordered
-                .ThenBy(info => info.NetCoreVersion ?? emptyVersion)
                 .ThenBy(info => info.Version ?? emptyVersion)
+                .ThenBy(info => info.NetCoreVersion ?? emptyVersion)
                 .ThenBy(info => info.Filename);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public static IOrderedEnumerable<AssemblyInfo> OrderAssemblyInfosByPreference(th`
`21`	`21`	`: assemblies.OrderBy(initialOrdering);`
`22`	`22`
`23`	`23`	`return ordered`
`24`		`- .ThenBy(info => info.NetCoreVersion ?? emptyVersion)`
`25`	`24`	`.ThenBy(info => info.Version ?? emptyVersion)`
	`25`	`+ .ThenBy(info => info.NetCoreVersion ?? emptyVersion)`
`26`	`26`	`.ThenBy(info => info.Filename);`
`27`	`27`	`}`
`28`	`28`	`}`