Skip to content

Commit 023d47c

Browse files
committed
make nuget package downloader use the unified config too
1 parent 833a52c commit 023d47c

18 files changed

+97
-28
lines changed

src/Cli/dotnet/Commands/Pack/PackCommand.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System.CommandLine;
55
using Microsoft.DotNet.Cli.Commands.Restore;
6+
using Microsoft.DotNet.Cli.Configuration;
67
using Microsoft.DotNet.Cli.Extensions;
78
using Microsoft.DotNet.Cli.Utils;
89

@@ -27,11 +28,12 @@ public static PackCommand FromParseResult(ParseResult parseResult, string? msbui
2728

2829
var msbuildArgs = parseResult.OptionValuesToBeForwarded(PackCommandParser.GetCommand()).Concat(parseResult.GetValue(PackCommandParser.SlnOrProjectArgument) ?? []);
2930

31+
var configurationService = DotNetConfigurationFactory.Create();
3032
ReleasePropertyProjectLocator projectLocator = new(parseResult, MSBuildPropertyNames.PACK_RELEASE,
3133
new ReleasePropertyProjectLocator.DependentCommandOptions(
3234
parseResult.GetValue(PackCommandParser.SlnOrProjectArgument),
3335
parseResult.HasOption(PackCommandParser.ConfigurationOption) ? parseResult.GetValue(PackCommandParser.ConfigurationOption) : null
34-
)
36+
), configurationService
3537
);
3638

3739
bool noRestore = parseResult.HasOption(PackCommandParser.NoRestoreOption) || parseResult.HasOption(PackCommandParser.NoBuildOption);

src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
using System.CommandLine;
77
using System.CommandLine.Completions;
88
using System.CommandLine.Parsing;
9+
using Microsoft.DotNet.Cli.Configuration;
910
using Microsoft.DotNet.Cli.Extensions;
11+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
1012
using Microsoft.Extensions.EnvironmentAbstractions;
1113
using NuGet.Versioning;
1214

@@ -115,7 +117,7 @@ public static async Task<IEnumerable<string>> QueryNuGet(string packageStem, boo
115117
{
116118
try
117119
{
118-
var downloader = new NuGetPackageDownloader.NuGetPackageDownloader(packageInstallDir: new DirectoryPath());
120+
var downloader = new NuGetPackageDownloader.NuGetPackageDownloader(packageInstallDir: new DirectoryPath(), configurationService: DotNetConfigurationFactory.Create());
119121
var versions = await downloader.GetPackageIdsAsync(packageStem, allowPrerelease, cancellationToken: cancellationToken);
120122
return versions;
121123
}
@@ -129,7 +131,7 @@ internal static async Task<IEnumerable<NuGetVersion>> QueryVersionsForPackage(st
129131
{
130132
try
131133
{
132-
var downloader = new NuGetPackageDownloader.NuGetPackageDownloader(packageInstallDir: new DirectoryPath());
134+
var downloader = new NuGetPackageDownloader.NuGetPackageDownloader(packageInstallDir: new DirectoryPath(), configurationService: DotNetConfigurationFactory.Create());
133135
var versions = await downloader.GetPackageVersionsAsync(new(packageId), versionFragment, allowPrerelease, cancellationToken: cancellationToken);
134136
return versions;
135137
}

src/Cli/dotnet/Commands/Publish/PublishCommand.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.CommandLine;
55
using Microsoft.DotNet.Cli.Commands.Restore;
66
using Microsoft.DotNet.Cli.Commands.Run;
7+
using Microsoft.DotNet.Cli.Configuration;
78
using Microsoft.DotNet.Cli.Extensions;
89
using Microsoft.DotNet.Cli.Utils;
910

@@ -56,12 +57,13 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
5657
NoCache = true,
5758
},
5859
(msbuildArgs, msbuildPath) => {
60+
var configurationService = DotNetConfigurationFactory.Create();
5961
var options = new ReleasePropertyProjectLocator.DependentCommandOptions(
6062
nonBinLogArgs,
6163
parseResult.HasOption(PublishCommandParser.ConfigurationOption) ? parseResult.GetValue(PublishCommandParser.ConfigurationOption) : null,
6264
parseResult.HasOption(PublishCommandParser.FrameworkOption) ? parseResult.GetValue(PublishCommandParser.FrameworkOption) : null
6365
);
64-
var projectLocator = new ReleasePropertyProjectLocator(parseResult, MSBuildPropertyNames.PUBLISH_RELEASE, options);
66+
var projectLocator = new ReleasePropertyProjectLocator(parseResult, MSBuildPropertyNames.PUBLISH_RELEASE, options, configurationService);
6567
var releaseModeProperties = projectLocator.GetCustomDefaultConfigurationValueIfSpecified();
6668
return new PublishCommand(
6769
msbuildArgs: msbuildArgs.CloneWithAdditionalProperties(releaseModeProperties),

src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55

66
using System.CommandLine;
77
using System.Transactions;
8+
using Microsoft.DotNet.Cli.Configuration;
89
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
910
using Microsoft.DotNet.Cli.ToolPackage;
1011
using Microsoft.DotNet.Cli.Utils;
12+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
1113
using Microsoft.Extensions.EnvironmentAbstractions;
1214
using NuGet.Common;
1315
using NuGet.Frameworks;
@@ -96,7 +98,7 @@ public ToolInstallGlobalOrToolPathCommand(
9698
NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption) || parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoHttpCacheOption),
9799
IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption),
98100
Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption));
99-
nugetPackageDownloader ??= new NuGetPackageDownloader.NuGetPackageDownloader(tempDir, verboseLogger: new NullLogger(), restoreActionConfig: restoreActionConfig, verbosityOptions: _verbosity, verifySignatures: verifySignatures ?? true);
101+
nugetPackageDownloader ??= new NuGetPackageDownloader.NuGetPackageDownloader(tempDir, DotNetConfigurationFactory.Create(), verboseLogger: new NullLogger(), restoreActionConfig: restoreActionConfig, verbosityOptions: _verbosity, verifySignatures: verifySignatures ?? true);
100102
_shellShimTemplateFinder = new ShellShimTemplateFinder(nugetPackageDownloader, tempDir, packageSourceLocation);
101103
_store = store;
102104

src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
using System.Text.Json;
88
using Microsoft.DotNet.Cli.Commands.Workload.Config;
99
using Microsoft.DotNet.Cli.Commands.Workload.Install.WorkloadInstallRecords;
10+
using Microsoft.DotNet.Cli.Configuration;
1011
using Microsoft.DotNet.Cli.Extensions;
1112
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
1213
using Microsoft.DotNet.Cli.ToolPackage;
1314
using Microsoft.DotNet.Cli.Utils;
1415
using Microsoft.DotNet.NativeWrapper;
16+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
1517
using Microsoft.Extensions.EnvironmentAbstractions;
1618
using Microsoft.NET.Sdk.WorkloadManifestReader;
1719
using NuGet.Common;
@@ -60,8 +62,11 @@ public FileBasedInstaller(IReporter reporter,
6062
ILogger logger = verbosity.IsDetailedOrDiagnostic() ? new NuGetConsoleLogger() : new NullLogger();
6163
_restoreActionConfig = restoreActionConfig;
6264
_nugetPackageDownloader = nugetPackageDownloader ??
63-
new NuGetPackageDownloader.NuGetPackageDownloader(_tempPackagesDir, filePermissionSetter: null,
64-
new FirstPartyNuGetPackageSigningVerifier(), logger,
65+
new NuGetPackageDownloader.NuGetPackageDownloader(_tempPackagesDir,
66+
DotNetConfigurationFactory.Create(),
67+
filePermissionSetter: null,
68+
firstPartyNuGetPackageSigningVerifier: new FirstPartyNuGetPackageSigningVerifier(),
69+
verboseLogger: logger,
6570
restoreActionConfig: _restoreActionConfig,
6671
verbosityOptions: nugetPackageDownloaderVerbosity);
6772
bool userLocal = WorkloadFileBasedInstall.IsUserLocal(_dotnetDir, sdkFeatureBand.ToString());

src/Cli/dotnet/Commands/Workload/Install/NetSdkMsiInstallerClient.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
using System.Runtime.Versioning;
88
using Microsoft.DotNet.Cli.Commands.Workload.Config;
99
using Microsoft.DotNet.Cli.Commands.Workload.Install.WorkloadInstallRecords;
10+
using Microsoft.DotNet.Cli.Configuration;
1011
using Microsoft.DotNet.Cli.Installer.Windows;
1112
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
1213
using Microsoft.DotNet.Cli.ToolPackage;
1314
using Microsoft.DotNet.Cli.Utils;
1415
using Microsoft.DotNet.Cli.Utils.Extensions;
16+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
1517
using Microsoft.Extensions.EnvironmentAbstractions;
1618
using Microsoft.NET.Sdk.WorkloadManifestReader;
1719
using Microsoft.Win32.Msi;
@@ -1128,8 +1130,11 @@ public static NetSdkMsiInstallerClient Create(
11281130
DirectoryPath tempPackagesDir = new(string.IsNullOrWhiteSpace(tempDirPath) ? PathUtilities.CreateTempSubdirectory() : tempDirPath);
11291131

11301132
nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(tempPackagesDir,
1131-
filePermissionSetter: null, new FirstPartyNuGetPackageSigningVerifier(),
1132-
new NullLogger(), restoreActionConfig: restoreActionConfig);
1133+
DotNetConfigurationFactory.Create(),
1134+
filePermissionSetter: null,
1135+
firstPartyNuGetPackageSigningVerifier: new FirstPartyNuGetPackageSigningVerifier(),
1136+
verboseLogger: new NullLogger(),
1137+
restoreActionConfig: restoreActionConfig);
11331138
}
11341139

11351140
return new NetSdkMsiInstallerClient(elevationContext, logger, verifySignatures, workloadResolver, sdkFeatureBand, nugetPackageDownloader,

src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallCommand.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
using System.CommandLine;
77
using System.Text.Json;
8+
using Microsoft.DotNet.Cli.Configuration;
89
using Microsoft.DotNet.Cli.Extensions;
910
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
1011
using Microsoft.DotNet.Cli.ToolPackage;
1112
using Microsoft.DotNet.Cli.Utils;
1213
using Microsoft.DotNet.Cli.Utils.Extensions;
14+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
1315
using Microsoft.Extensions.EnvironmentAbstractions;
1416
using Microsoft.NET.Sdk.WorkloadManifestReader;
1517
using NuGet.Common;
@@ -112,10 +114,11 @@ public override int Execute()
112114
{
113115
var packageDownloader = IsPackageDownloaderProvided ? PackageDownloader : new NuGetPackageDownloader.NuGetPackageDownloader(
114116
TempPackagesDirectory,
117+
DotNetConfigurationFactory.Create(),
115118
filePermissionSetter: null,
116-
new FirstPartyNuGetPackageSigningVerifier(),
117-
new NullLogger(),
118-
NullReporter.Instance,
119+
firstPartyNuGetPackageSigningVerifier: new FirstPartyNuGetPackageSigningVerifier(),
120+
verboseLogger: new NullLogger(),
121+
reporter: NullReporter.Instance,
119122
restoreActionConfig: RestoreActionConfiguration,
120123
verifySignatures: VerifySignatures);
121124

src/Cli/dotnet/Commands/Workload/Install/WorkloadManifestUpdater.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
using System.Text.Json;
77
using Microsoft.DotNet.Cli.Commands.Workload.Install.WorkloadInstallRecords;
88
using Microsoft.DotNet.Cli.Commands.Workload.List;
9+
using Microsoft.DotNet.Cli.Configuration;
910
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
1011
using Microsoft.DotNet.Cli.ToolPackage;
1112
using Microsoft.DotNet.Cli.Utils;
1213
using Microsoft.DotNet.Cli.Utils.Extensions;
1314
using Microsoft.DotNet.Configurer;
15+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
1416
using Microsoft.Extensions.EnvironmentAbstractions;
1517
using Microsoft.NET.Sdk.WorkloadManifestReader;
1618
using NuGet.Common;
@@ -66,10 +68,11 @@ private static WorkloadManifestUpdater GetInstance(string userProfileDir)
6668
var workloadResolver = WorkloadResolver.Create(workloadManifestProvider, dotnetPath, sdkVersion, userProfileDir);
6769
var tempPackagesDir = new DirectoryPath(PathUtilities.CreateTempSubdirectory());
6870
var nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(tempPackagesDir,
71+
DotNetConfigurationFactory.Create(),
6972
filePermissionSetter: null,
70-
new FirstPartyNuGetPackageSigningVerifier(),
71-
new NullLogger(),
72-
reporter,
73+
firstPartyNuGetPackageSigningVerifier: new FirstPartyNuGetPackageSigningVerifier(),
74+
verboseLogger: new NullLogger(),
75+
reporter: reporter,
7376
verifySignatures: SignCheck.IsDotNetSigned());
7477
var installer = WorkloadInstallerFactory.GetWorkloadInstaller(reporter, new SdkFeatureBand(sdkVersion),
7578
workloadResolver, VerbosityOptions.normal, userProfileDir, verifySignatures: false);

src/Cli/dotnet/Commands/Workload/Update/WorkloadUpdateCommand.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
using System.CommandLine;
77
using System.Text.Json;
88
using Microsoft.DotNet.Cli.Commands.Workload.Install;
9+
using Microsoft.DotNet.Cli.Configuration;
910
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
1011
using Microsoft.DotNet.Cli.ToolPackage;
1112
using Microsoft.DotNet.Cli.Utils;
13+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
1214
using Microsoft.Extensions.EnvironmentAbstractions;
1315
using Microsoft.NET.Sdk.WorkloadManifestReader;
1416
using NuGet.Common;
@@ -85,10 +87,11 @@ public override int Execute()
8587
{
8688
var packageDownloader = IsPackageDownloaderProvided ? PackageDownloader : new NuGetPackageDownloader.NuGetPackageDownloader(
8789
TempPackagesDirectory,
90+
DotNetConfigurationFactory.Create(),
8891
filePermissionSetter: null,
89-
new FirstPartyNuGetPackageSigningVerifier(),
90-
new NullLogger(),
91-
NullReporter.Instance,
92+
firstPartyNuGetPackageSigningVerifier: new FirstPartyNuGetPackageSigningVerifier(),
93+
verboseLogger: new NullLogger(),
94+
reporter: NullReporter.Instance,
9295
restoreActionConfig: RestoreActionConfiguration,
9396
verifySignatures: VerifySignatures);
9497

src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
using System.CommandLine;
55
using Microsoft.DotNet.Cli.Commands.Workload.Install;
6+
using Microsoft.DotNet.Cli.Configuration;
67
using Microsoft.DotNet.Cli.Extensions;
78
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
89
using Microsoft.DotNet.Cli.Utils;
10+
using Microsoft.Extensions.Configuration.DotnetCli.Services;
911
using Microsoft.Extensions.EnvironmentAbstractions;
1012
using NuGet.Common;
1113

@@ -120,10 +122,11 @@ public WorkloadCommandBase(
120122
IsPackageDownloaderProvided = false;
121123
PackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(
122124
TempPackagesDirectory,
125+
DotNetConfigurationFactory.Create(),
123126
filePermissionSetter: null,
124-
new FirstPartyNuGetPackageSigningVerifier(),
125-
nugetLogger,
126-
Reporter,
127+
firstPartyNuGetPackageSigningVerifier: new FirstPartyNuGetPackageSigningVerifier(),
128+
verboseLogger: nugetLogger,
129+
reporter: Reporter,
127130
restoreActionConfig: RestoreActionConfiguration,
128131
verifySignatures: VerifySignatures,
129132
shouldUsePackageSourceMapping: true);

0 commit comments

Comments
 (0)