fix compilation errors in tests

Author: baronfel

test/Microsoft.DotNet.PackageInstall.Tests/NuGetPackageInstallerTests.cs

@@ -7,9 +7,11 @@
 using System.Reflection;
 using System.Security.Cryptography;
 using Microsoft.DotNet.Cli;
+using Microsoft.DotNet.Cli.Configuration;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.Extensions.Configuration.DotnetCli.Services;
 using Microsoft.Extensions.EnvironmentAbstractions;
 using NuGet.Configuration;
 using NuGet.Packaging;
@@ -35,12 +37,24 @@ public NuGetPackageInstallerTests(ITestOutputHelper log) : base(log)
         {
             _tempDirectory = GetUniqueTempProjectPathEachTest();
             _logger = new NuGetTestLogger();
+            var configurationService = DotNetConfigurationFactory.CreateMinimal();
             _installer =
-                new NuGetPackageDownloader(_tempDirectory, null, new MockFirstPartyNuGetPackageSigningVerifier(), _logger,
-                    restoreActionConfig: new RestoreActionConfig(NoCache: true), timer: () => ExponentialRetry.Timer(ExponentialRetry.TestingIntervals));
+                new NuGetPackageDownloader(
+                    packageInstallDir: _tempDirectory,
+                    configurationService: configurationService,
+                    firstPartyNuGetPackageSigningVerifier: new MockFirstPartyNuGetPackageSigningVerifier(),
+                    verboseLogger: _logger,
+                    restoreActionConfig: new RestoreActionConfig(NoCache: true),
+                    timer: () => ExponentialRetry.Timer(ExponentialRetry.TestingIntervals));
             _toolInstaller =
-                new NuGetPackageDownloader(_tempDirectory, null, new MockFirstPartyNuGetPackageSigningVerifier(), _logger,
-                    restoreActionConfig: new RestoreActionConfig(NoCache: true), timer: () => ExponentialRetry.Timer(ExponentialRetry.TestingIntervals), shouldUsePackageSourceMapping: true);
+                new NuGetPackageDownloader(
+                    packageInstallDir: _tempDirectory,
+                    configurationService: configurationService,
+                    firstPartyNuGetPackageSigningVerifier: new MockFirstPartyNuGetPackageSigningVerifier(),
+                    verboseLogger: _logger,
+                    restoreActionConfig: new RestoreActionConfig(NoCache: true),
+                    timer: () => ExponentialRetry.Timer(ExponentialRetry.TestingIntervals),
+                    shouldUsePackageSourceMapping: true);
         }
 
         [Fact]
@@ -75,9 +89,14 @@ await Assert.ThrowsAsync<NuGetPackageNotFoundException>(() =>
         [Fact]
         public async Task GivenAFailedSourceAndIgnoreFailedSourcesItShouldNotThrowFatalProtocolException()
         {
+            var configurationService = DotNetConfigurationFactory.CreateMinimal();
             var installer =
-                new NuGetPackageDownloader(_tempDirectory, null, new MockFirstPartyNuGetPackageSigningVerifier(),
-                    _logger, restoreActionConfig: new RestoreActionConfig(IgnoreFailedSources: true, NoCache: true));
+                new NuGetPackageDownloader(
+                    packageInstallDir: _tempDirectory,
+                    configurationService: configurationService,
+                    firstPartyNuGetPackageSigningVerifier: new MockFirstPartyNuGetPackageSigningVerifier(),
+                    verboseLogger: _logger,
+                    restoreActionConfig: new RestoreActionConfig(IgnoreFailedSources: true, NoCache: true));
 
             // should not throw FatalProtocolException
             // when there is at least one valid source, it should pass.
@@ -232,9 +251,14 @@ public async Task WhenPassedIncludePreviewItInstallSucceeds()
         public async Task GivenANonSignedSdkItShouldPrintMessageOnce()
         {
             BufferedReporter bufferedReporter = new();
-            NuGetPackageDownloader nuGetPackageDownloader = new(_tempDirectory, null,
-                new MockFirstPartyNuGetPackageSigningVerifier(),
-                _logger, bufferedReporter, restoreActionConfig: new RestoreActionConfig(NoCache: true));
+            var configurationService = DotNetConfigurationFactory.CreateMinimal();
+            NuGetPackageDownloader nuGetPackageDownloader = new(
+                packageInstallDir: _tempDirectory,
+                configurationService: configurationService,
+                firstPartyNuGetPackageSigningVerifier: new MockFirstPartyNuGetPackageSigningVerifier(),
+                verboseLogger: _logger,
+                reporter: bufferedReporter,
+                restoreActionConfig: new RestoreActionConfig(NoCache: true));
             await nuGetPackageDownloader.DownloadPackageAsync(
                 TestPackageId,
                 new NuGetVersion(TestPackageVersion),
@@ -256,9 +280,15 @@ await nuGetPackageDownloader.DownloadPackageAsync(
         public async Task GivenANonSignedSdkItShouldNotPrintMessageInQuiet()
         {
             BufferedReporter bufferedReporter = new BufferedReporter();
-            NuGetPackageDownloader nuGetPackageDownloader = new NuGetPackageDownloader(_tempDirectory, null,
-                new MockFirstPartyNuGetPackageSigningVerifier(),
-                _logger, bufferedReporter, restoreActionConfig: new RestoreActionConfig(NoCache: true), verbosityOptions: VerbosityOptions.quiet);
+            var configurationService = DotNetConfigurationFactory.CreateMinimal();
+            NuGetPackageDownloader nuGetPackageDownloader = new NuGetPackageDownloader(
+                packageInstallDir: _tempDirectory,
+                configurationService: configurationService,
+                firstPartyNuGetPackageSigningVerifier: new MockFirstPartyNuGetPackageSigningVerifier(),
+                verboseLogger: _logger,
+                reporter: bufferedReporter,
+                restoreActionConfig: new RestoreActionConfig(NoCache: true),
+                verbosityOptions: VerbosityOptions.quiet);
             await nuGetPackageDownloader.DownloadPackageAsync(
                 TestPackageId,
                 new NuGetVersion(TestPackageVersion),
@@ -290,9 +320,13 @@ public void ItShouldHaveUpdateToDateCertificateSha()
 
         private string DownloadSamplePackage(PackageId packageId)
         {
-            NuGetPackageDownloader nuGetPackageDownloader = new(_tempDirectory, null,
-                new MockFirstPartyNuGetPackageSigningVerifier(),
-                _logger, restoreActionConfig: new RestoreActionConfig(NoCache: true));
+            var configurationService = DotNetConfigurationFactory.CreateMinimal();
+            NuGetPackageDownloader nuGetPackageDownloader = new(
+                packageInstallDir: _tempDirectory,
+                configurationService: configurationService,
+                firstPartyNuGetPackageSigningVerifier: new MockFirstPartyNuGetPackageSigningVerifier(),
+                verboseLogger: _logger,
+                restoreActionConfig: new RestoreActionConfig(NoCache: true));
 
             return ExponentialRetry.ExecuteWithRetry<string>(
                     action: DownloadMostRecentSamplePackageFromPublicFeed,

test/dotnet.Tests/CommandTests/Tool/Install/ToolInstallGlobalOrToolPathCommandTests.cs

@@ -10,12 +10,14 @@
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
 using Microsoft.DotNet.Cli.Commands.Tool.Uninstall;
 using Microsoft.DotNet.Cli.Commands.Tool.Update;
+using Microsoft.DotNet.Cli.Configuration;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.ShellShim;
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.DotNet.Tools.Tests.ComponentMocks;
+using Microsoft.Extensions.Configuration.DotnetCli.Services;
 using Microsoft.Extensions.DependencyModel.Tests;
 using Microsoft.Extensions.EnvironmentAbstractions;
 using CreateShellShimRepository = Microsoft.DotNet.Cli.Commands.Tool.Install.CreateShellShimRepository;
@@ -121,7 +123,10 @@ public void WhenDuplicateSourceIsPassedIgnore()
                 nugetConfig: new FilePath(Path.Combine(testAsset.Path, "NuGet.config")),
                 rootConfigDirectory: new DirectoryPath(testAsset.Path),
                 additionalSourceFeeds: [duplicateSource]);
-            var nuGetPackageDownloader = new NuGetPackageDownloader(new DirectoryPath(testAsset.Path));
+            var configurationService = DotNetConfigurationFactory.CreateMinimal();
+            var nuGetPackageDownloader = new NuGetPackageDownloader(
+                packageInstallDir: new DirectoryPath(testAsset.Path),
+                configurationService: configurationService);
 
             var sources = nuGetPackageDownloader.LoadNuGetSources(new Cli.ToolPackage.PackageId(PackageId), packageSourceLocation);
             // There should only be one source
@@ -558,7 +563,7 @@ public void WhenInstallWithLowerVersionWithAllowDowngradeOptionItShouldDowngrade
         public void WhenInstallWithLowerVersionItShouldFail()
         {
             AddLowerToolPackageVersionToFeed();
-            
+
             ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion}");
 
             var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand(
@@ -640,7 +645,11 @@ public void WhenRunWithValidVersionItShouldInterpretAsNuGetExactVersion(string v
                     return (toolPackageStore, toolPackageStore, toolPackageDownloader, toolPackageUninstaller);
                 },
                 createShellShimRepository: _createShellShimRepository,
-                nugetPackageDownloader: new NuGetPackageDownloader(new DirectoryPath(PathUtilities.CreateTempSubdirectory()), verifySignatures: false, currentWorkingDirectory: testDir),
+                nugetPackageDownloader: new NuGetPackageDownloader(
+                    packageInstallDir: new DirectoryPath(PathUtilities.CreateTempSubdirectory()),
+                    configurationService: DotNetConfigurationFactory.CreateMinimal(),
+                    verifySignatures: false,
+                    currentWorkingDirectory: testDir),
                 currentWorkingDirectory: testDir,
                 verifySignatures: false);
 
@@ -753,7 +762,7 @@ private void AddLowerToolPackageVersionToFeed()
             });
         }
 
-        
+
         private void AddHigherToolPackageVersionToFeed()
         {
             _toolPackageDownloader.AddMockPackage(new MockFeedPackage