Merge pull request github#13420 from tamasvajk/feature/standalone-mscorlib

tamasvajk · web-flow · commit aed6a75cd4ec · 2023-06-13T09:29:16.000+02:00
C#: Make sure System.Private.CoreLib is added only once as a reference in standalone extraction
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BuildAnalysis.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BuildAnalysis.cs
@@ -120,13 +120,13 @@ public BuildAnalysis(Options options, IProgressMonitor progress)
                     UseReference(filename);
             }
 
-            ResolveConflicts();
-
             if (options.UseMscorlib)
             {
                 UseReference(typeof(object).Assembly.Location);
             }
 
+            ResolveConflicts();
+
             // Output the findings
             foreach (var r in usedReferences.Keys)
             {

Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,13 @@ public BuildAnalysis(Options options, IProgressMonitor progress)`
`120`	`120`	`UseReference(filename);`
`121`	`121`	`}`
`122`	`122`
`123`		`- ResolveConflicts();`
`124`		`-`
`125`	`123`	`if (options.UseMscorlib)`
`126`	`124`	`{`
`127`	`125`	`UseReference(typeof(object).Assembly.Location);`
`128`	`126`	`}`
`129`	`127`
	`128`	`+ ResolveConflicts();`
	`129`	`+`
`130`	`130`	`// Output the findings`
`131`	`131`	`foreach (var r in usedReferences.Keys)`
`132`	`132`	`{`