Remove restored framework packages when user specified framework folders

tamasvajk · tamasvajk · commit c68d36eb7937 · 2024-02-16T14:42:39.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -163,6 +163,10 @@ private HashSet<string> AddFrameworkDlls(HashSet<string> dllPaths)
             _ = bool.TryParse(frameworkReferencesUseSubfolders, out var useSubfolders);
             if (!string.IsNullOrWhiteSpace(frameworkReferences))
             {
+                RemoveFrameworkNugetPackages(dllPaths);
+                RemoveNugetPackageReference(FrameworkPackageNames.AspNetCoreFramework, dllPaths);
+                RemoveNugetPackageReference(FrameworkPackageNames.WindowsDesktopFramework, dllPaths);
+
                 var frameworkPaths = frameworkReferences.Split(FileUtils.NewLineCharacters, StringSplitOptions.RemoveEmptyEntries);
 
                 foreach (var path in frameworkPaths)
@@ -246,9 +250,9 @@ private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<
                 nugetPackageDllPaths.ExceptWith(excludedPaths);
                 dllPaths.UnionWith(nugetPackageDllPaths);
             }
-            catch (Exception)
+            catch (Exception exc)
             {
-                logger.LogError("Failed to restore Nuget packages with nuget.exe");
+                logger.LogError($"Failed to restore Nuget packages with nuget.exe: {exc.Message}");
             }
 
             var restoredProjects = RestoreSolutions(allSolutions, out var assets1);
@@ -339,6 +343,15 @@ private static DirectoryInfo[] GetPackageVersionSubDirectories(string packagePat
                 .ToArray();
         }
 
+        private void RemoveFrameworkNugetPackages(ISet<string> dllPaths, int fromIndex = 0)
+        {
+            var packagesInPrioOrder = FrameworkPackageNames.NetFrameworks;
+            for (var i = fromIndex; i < packagesInPrioOrder.Length; i++)
+            {
+                RemoveNugetPackageReference(packagesInPrioOrder[i], dllPaths);
+            }
+        }
+
         private void AddNetFrameworkDlls(ISet<string> dllPaths, ISet<string> frameworkLocations)
         {
             // Multiple dotnet framework packages could be present.
@@ -360,12 +373,7 @@ private void AddNetFrameworkDlls(ISet<string> dllPaths, ISet<string> frameworkLo
                 }
 
                 SelectNewestFrameworkPath(frameworkPath.Path, ".NET Framework", dllPaths, frameworkLocations);
-
-                for (var i = frameworkPath.Index + 1; i < packagesInPrioOrder.Length; i++)
-                {
-                    RemoveNugetPackageReference(packagesInPrioOrder[i], dllPaths);
-                }
-
+                RemoveFrameworkNugetPackages(dllPaths, frameworkPath.Index + 1);
                 return;
             }
 
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.expected
@@ -1,164 +1 @@
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.CSharp.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.VisualBasic.Core.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.VisualBasic.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.Registry.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.AppContext.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Buffers.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Concurrent.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Immutable.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.NonGeneric.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Specialized.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Annotations.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.DataAnnotations.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.EventBasedAsync.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.TypeConverter.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Configuration.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Console.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Core.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Data.Common.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Data.DataSetExtensions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Data.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Contracts.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Debug.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.DiagnosticSource.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.FileVersionInfo.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Process.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.StackTrace.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TextWriterTraceListener.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tools.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TraceSource.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tracing.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Drawing.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Drawing.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Dynamic.Runtime.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Asn1.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Tar.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Calendars.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Extensions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.Brotli.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.FileSystem.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.ZipFile.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.AccessControl.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.DriveInfo.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Watcher.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.IsolatedStorage.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.MemoryMappedFiles.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.AccessControl.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.UnmanagedMemoryStream.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Expressions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Parallel.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Queryable.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Memory.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.Json.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.HttpListener.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Mail.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NameResolution.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NetworkInformation.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Ping.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Quic.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Requests.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Security.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.ServicePoint.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Sockets.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebClient.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebHeaderCollection.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebProxy.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.Client.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Numerics.Vectors.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Numerics.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ObjectModel.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.DispatchProxy.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.ILGeneration.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.Lightweight.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Extensions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Metadata.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.TypeExtensions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Reader.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.ResourceManager.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Writer.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.Unsafe.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.VisualC.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Extensions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Handles.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.JavaScript.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.RuntimeInformation.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Intrinsics.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Loader.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Numerics.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Formatters.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Json.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Xml.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.AccessControl.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Claims.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Algorithms.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Cng.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Csp.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Encoding.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.OpenSsl.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Primitives.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.X509Certificates.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.Windows.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.SecureString.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ServiceModel.Web.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ServiceProcess.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.CodePages.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.Extensions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encodings.Web.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Json.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.RegularExpressions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Channels.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Overlapped.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Dataflow.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Extensions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Parallel.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Thread.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.ThreadPool.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Timer.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Transactions.Local.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Transactions.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ValueTuple.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Web.HttpUtility.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Web.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Windows.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.Linq.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.ReaderWriter.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.Serialization.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XDocument.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.XDocument.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlDocument.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlSerializer.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/WindowsBase.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/mscorlib.dll |
-| /packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/netstandard.dll |
 | /packages/newtonsoft.json/6.0.4/lib/net45/Newtonsoft.Json.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/test_sdk.csproj b/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/test_sdk.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk.Web">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<OutputType>Exe</OutputType>`