GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — C#: Do not set the private registry proxy environment variables when … · github/codeql@c992610

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching
- NugetPackageRestorer.cs
- PackagesConfigRestorer.cs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs‎`

Copy file name to clipboardExpand all lines: csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs

+1-3Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ internal sealed partial class NugetPackageRestorer : IDisposable`
`18`	`18`	`private readonly IFileProvider fileProvider;`
`19`	`19`	`private readonly FileContent fileContent;`
`20`	`20`	`private readonly IDotNet dotnet;`
`21`		`- private readonly IRegistryProxy? registryProxy;`
`22`	`21`	`private readonly IDiagnosticsWriter diagnosticsWriter;`
`23`	`22`	`private readonly DependencyDirectory legacyPackageDirectory;`
`24`	`23`	`private readonly DependencyDirectory missingPackageDirectory;`
`@@ -41,7 +40,6 @@ public NugetPackageRestorer(`
`41`	`40`	`this.fileProvider = fileProvider;`
`42`	`41`	`this.fileContent = fileContent;`
`43`	`42`	`this.dotnet = dotnet;`
`44`		`- this.registryProxy = registryProxy;`
`45`	`43`	`this.diagnosticsWriter = diagnosticsWriter;`
`46`	`44`	`this.logger = logger;`
`47`	`45`	`this.compilationInfoContainer = compilationInfoContainer;`
`@@ -135,7 +133,7 @@ public HashSet<AssemblyLookupLocation> Restore()`
`135`	`133`
`136`	`134`	`try`
`137`	`135`	`{`
`138`		`- var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager, registryProxy);`
	`136`	`+ var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager);`
`139`	`137`	`var count = packagesConfigRestore.InstallPackages();`
`140`	`138`	`if (packagesConfigRestore.PackageCount > 0)`
`141`	`139`	`{`

Collapse file

`‎csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs‎`

Copy file name to clipboardExpand all lines: csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs

+3-8Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,11 @@ internal interface IPackagesConfigRestore`
`33`	`33`	`/// </summary>`
`34`	`34`	`internal class PackagesConfigRestoreFactory`
`35`	`35`	`{`
`36`		`- public static IPackagesConfigRestore Create(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, IRegistryProxy? registryProxy)`
	`36`	`+ public static IPackagesConfigRestore Create(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager)`
`37`	`37`	`{`
`38`	`38`	`if (SystemBuildActions.Instance.IsWindows() \|\| SystemBuildActions.Instance.IsMonoInstalled())`
`39`	`39`	`{`
`40`		`- return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager, registryProxy);`
	`40`	`+ return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return new NoOpPackagesConfig(fileProvider.PackagesConfigs, logger);`
`@@ -52,7 +52,6 @@ private class NugetExeWrapper : IPackagesConfigRestore`
`52`	`52`	`{`
`53`	`53`	`private readonly string? nugetExe;`
`54`	`54`	`private readonly Semmle.Util.Logging.ILogger logger;`
`55`		`- private readonly IRegistryProxy? registryProxy;`
`56`	`55`
`57`	`56`	`public int PackageCount => fileProvider.PackagesConfigs.Count;`
`58`	`57`
`@@ -71,13 +70,12 @@ private class NugetExeWrapper : IPackagesConfigRestore`
`71`	`70`	`/// <summary>`
`72`	`71`	`/// Create the package manager for a specified source tree.`
`73`	`72`	`/// </summary>`
`74`		`- public NugetExeWrapper(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, IRegistryProxy? registryProxy)`
	`73`	`+ public NugetExeWrapper(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager)`
`75`	`74`	`{`
`76`	`75`	`this.fileProvider = fileProvider;`
`77`	`76`	`this.packageDirectory = packageDirectory;`
`78`	`77`	`this.logger = logger;`
`79`	`78`	`this.feedManager = feedManager;`
`80`		`- this.registryProxy = registryProxy;`
`81`	`79`
`82`	`80`	`if (fileProvider.PackagesConfigs.Count > 0)`
`83`	`81`	`{`
`@@ -211,9 +209,6 @@ private bool TryRestoreNugetPackage(string packagesConfig)`
`211`	`209`	`UseShellExecute = false`
`212`	`210`	`};`
`213`	`211`
`214`		`- // Configure the proxy settings, if applicable.`
`215`		`- registryProxy?.SetProcessEnvironment(pi);`
`216`		`-`
`217`	`212`	`var threadId = Environment.CurrentManagedThreadId;`
`218`	`213`	`void onOut(string s) => logger.LogDebug(s, threadId);`
`219`	`214`	`void onError(string s) => logger.LogError(s, threadId);`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.