Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,14 @@ private void DoInitialize()
logger.LogDebug($"Failed to read file {file}, exception: {ex}");
}
}

logger.LogInfo("Finished reading project files.");
logger.LogInfo($"Legacy project structure usage detected: {isLegacyProjectStructureUsed}");
logger.LogInfo($"ASP.NET usage detected: {useAspNetCoreDlls}");
logger.LogInfo($"New project structure usage detected: {isNewProjectStructureUsed}");
logger.LogInfo($"Windows Forms usage detected: {useWindowsForms}");
logger.LogInfo($"WPF usage detected: {useWpf}");
logger.LogInfo($"Implicit using namespaces detected: {useImplicitUsings}");
}

[GeneratedRegex("(?<!<!--.*)<PackageReference.*\\sInclude=\"(.*?)\".*/?>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ internal sealed partial class NugetPackageRestorer : IDisposable
private readonly IFileProvider fileProvider;
private readonly FileContent fileContent;
private readonly IDotNet dotnet;
private readonly IRegistryProxy? registryProxy;
private readonly IDiagnosticsWriter diagnosticsWriter;
private readonly DependencyDirectory legacyPackageDirectory;
private readonly DependencyDirectory missingPackageDirectory;
Expand All @@ -41,7 +40,6 @@ public NugetPackageRestorer(
this.fileProvider = fileProvider;
this.fileContent = fileContent;
this.dotnet = dotnet;
this.registryProxy = registryProxy;
this.diagnosticsWriter = diagnosticsWriter;
this.logger = logger;
this.compilationInfoContainer = compilationInfoContainer;
Expand Down Expand Up @@ -135,7 +133,7 @@ public HashSet<AssemblyLookupLocation> Restore()

try
{
var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager, registryProxy);
var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager);
var count = packagesConfigRestore.InstallPackages();
if (packagesConfigRestore.PackageCount > 0)
{
Expand All @@ -150,10 +148,9 @@ public HashSet<AssemblyLookupLocation> Restore()
.Where(path => IsPathInSubfolder(path, legacyPackageDirectory.DirInfo.FullName, "tools"))
.ToList();

if (nugetPackageDllPaths.Count > 0)
{
logger.LogInfo($"Restored {nugetPackageDllPaths.Count} NuGet DLLs.");
}

logger.LogInfo($"Restored {nugetPackageDllPaths.Count} NuGet DLLs.");

if (excludedPaths.Count > 0)
{
logger.LogInfo($"Excluding {excludedPaths.Count} NuGet DLLs.");
Expand All @@ -165,6 +162,13 @@ public HashSet<AssemblyLookupLocation> Restore()
}

nugetPackageDllPaths.ExceptWith(excludedPaths);

logger.LogInfo($"Using {nugetPackageDllPaths.Count} NuGet DLLs as dependency candidates.");
foreach (var path in nugetPackageDllPaths)
{
logger.LogDebug($"Using NuGet DLL as dependency candidate: {path}");
}

assemblyLookupLocations.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyLookupLocation(p)));
}
catch (Exception exc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ internal interface IPackagesConfigRestore
/// </summary>
internal class PackagesConfigRestoreFactory
{
public static IPackagesConfigRestore Create(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, IRegistryProxy? registryProxy)
public static IPackagesConfigRestore Create(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager)
{
if (SystemBuildActions.Instance.IsWindows() || SystemBuildActions.Instance.IsMonoInstalled())
{
return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager, registryProxy);
return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager);
}

return new NoOpPackagesConfig(fileProvider.PackagesConfigs, logger);
Expand All @@ -52,7 +52,6 @@ private class NugetExeWrapper : IPackagesConfigRestore
{
private readonly string? nugetExe;
private readonly Semmle.Util.Logging.ILogger logger;
private readonly IRegistryProxy? registryProxy;

public int PackageCount => fileProvider.PackagesConfigs.Count;

Expand All @@ -71,13 +70,12 @@ private class NugetExeWrapper : IPackagesConfigRestore
/// <summary>
/// Create the package manager for a specified source tree.
/// </summary>
public NugetExeWrapper(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, IRegistryProxy? registryProxy)
public NugetExeWrapper(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager)
{
this.fileProvider = fileProvider;
this.packageDirectory = packageDirectory;
this.logger = logger;
this.feedManager = feedManager;
this.registryProxy = registryProxy;

if (fileProvider.PackagesConfigs.Count > 0)
{
Expand Down Expand Up @@ -211,9 +209,6 @@ private bool TryRestoreNugetPackage(string packagesConfig)
UseShellExecute = false
};

// Configure the proxy settings, if applicable.
registryProxy?.SetProcessEnvironment(pi);

var threadId = Environment.CurrentManagedThreadId;
void onOut(string s) => logger.LogDebug(s, threadId);
void onError(string s) => logger.LogError(s, threadId);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
category: minorAnalysis
---
* Rolled back the change that set proxy and certificate environment variables for the subprocess that invokes the NuGet CLI.
Loading