Make test skip sign check

src/Cli/dotnet/CommandFactory/CommandFactoryUsingResolver.cs

@@ -15,12 +15,14 @@ public static Command CreateDotNet(
  string commandName,
  IEnumerable<string> args,
  NuGetFramework framework = null,
- string configuration = Constants.DefaultConfiguration)
+ string configuration = Constants.DefaultConfiguration,
+ string currentWorkingDirectory = null)
  {
  return Create("dotnet",
  new[] { commandName }.Concat(args),
  framework,
- configuration: configuration);
+ configuration: configuration,
+ currentWorkingDirectory);
  }
 
  /// <summary>
@@ -35,7 +37,8 @@ public static Command Create(
  NuGetFramework framework = null,
  string configuration = Constants.DefaultConfiguration,
  string outputPath = null,
- string applicationName = null)
+ string applicationName = null,
+ string currentWorkingDirectory = null)
  {
  return Create(
  new DefaultCommandResolverPolicy(),
@@ -44,7 +47,8 @@ public static Command Create(
  framework,
  configuration,
  outputPath,
- applicationName);
+ applicationName,
+ currentWorkingDirectory);
  }
 
  public static Command Create(
@@ -54,7 +58,8 @@ public static Command Create(
  NuGetFramework framework = null,
  string configuration = Constants.DefaultConfiguration,
  string outputPath = null,
- string applicationName = null)
+ string applicationName = null,
+ string currentWorkingDirectory = null)
  {
  var commandSpec = CommandResolver.TryResolveCommandSpec(
  commandResolverPolicy,
@@ -63,7 +68,8 @@ public static Command Create(
  framework,
  configuration: configuration,
  outputPath: outputPath,
- applicationName: applicationName);
+ applicationName: applicationName,
+ currentWorkingDirectory: currentWorkingDirectory);
 
  if (commandSpec == null)
  {

src/Cli/dotnet/CommandFactory/CommandResolution/DefaultCommandResolverPolicy.cs

@@ -7,12 +7,12 @@ namespace Microsoft.DotNet.CommandFactory
 {
  public class DefaultCommandResolverPolicy : ICommandResolverPolicy
  {
- public CompositeCommandResolver CreateCommandResolver()
+ public CompositeCommandResolver CreateCommandResolver(string currentWorkingDirectory = null)
  {
- return Create();
+ return Create(currentWorkingDirectory);
  }
 
- public static CompositeCommandResolver Create()
+ public static CompositeCommandResolver Create(string currentWorkingDirectory = null)
  {
  var environment = new EnvironmentProvider();
  var packagedCommandSpecFactory = new PackagedCommandSpecFactoryWithCliRuntime();
@@ -32,20 +32,22 @@ public static CompositeCommandResolver Create()
  environment,
  packagedCommandSpecFactory,
  platformCommandSpecFactory,
- publishedPathCommandSpecFactory);
+ publishedPathCommandSpecFactory,
+ currentWorkingDirectory);
  }
 
  public static CompositeCommandResolver CreateDefaultCommandResolver(
  IEnvironmentProvider environment,
  IPackagedCommandSpecFactory packagedCommandSpecFactory,
  IPlatformCommandSpecFactory platformCommandSpecFactory,
- IPublishedPathCommandSpecFactory publishedPathCommandSpecFactory)
+ IPublishedPathCommandSpecFactory publishedPathCommandSpecFactory,
+ string currentWorkingDirectory = null)
  {
  var compositeCommandResolver = new CompositeCommandResolver();
 
  compositeCommandResolver.AddCommandResolver(new MuxerCommandResolver());
  compositeCommandResolver.AddCommandResolver(new DotnetToolsCommandResolver());
- compositeCommandResolver.AddCommandResolver(new LocalToolsCommandResolver());
+ compositeCommandResolver.AddCommandResolver(new LocalToolsCommandResolver(currentWorkingDirectory: currentWorkingDirectory));
  compositeCommandResolver.AddCommandResolver(new RootedCommandResolver());
  compositeCommandResolver.AddCommandResolver(
  new ProjectToolsCommandResolver(packagedCommandSpecFactory, environment));

src/Cli/dotnet/CommandFactory/CommandResolution/ICommandResolverPolicy.cs

@@ -5,6 +5,6 @@ namespace Microsoft.DotNet.CommandFactory
 {
  public interface ICommandResolverPolicy
  {
- CompositeCommandResolver CreateCommandResolver();
+ CompositeCommandResolver CreateCommandResolver(string currentWorkingDirectory = null);
  }
 }

src/Cli/dotnet/CommandFactory/CommandResolution/LocalToolsCommandResolver.cs

@@ -21,9 +21,10 @@ internal class LocalToolsCommandResolver : ICommandResolver
  public LocalToolsCommandResolver(
  ToolManifestFinder toolManifest = null,
  ILocalToolsResolverCache localToolsResolverCache = null,
- IFileSystem fileSystem = null)
+ IFileSystem fileSystem = null,
+ string currentWorkingDirectory = null)
  {
- _toolManifest = toolManifest ?? new ToolManifestFinder(new DirectoryPath(Directory.GetCurrentDirectory()));
+ _toolManifest = toolManifest ?? new ToolManifestFinder(new DirectoryPath(currentWorkingDirectory ?? Directory.GetCurrentDirectory()));
  _localToolsResolverCache = localToolsResolverCache ?? new LocalToolsResolverCache();
  _fileSystem = fileSystem ?? new FileSystemWrapper();
  }

src/Cli/dotnet/CommandFactory/CommandResolution/PathCommandResolverPolicy.cs

@@ -7,7 +7,7 @@ namespace Microsoft.DotNet.CommandFactory
 {
  public class PathCommandResolverPolicy : ICommandResolverPolicy
  {
- public CompositeCommandResolver CreateCommandResolver()
+ public CompositeCommandResolver CreateCommandResolver(string CurrentWorkingDirectory = null)
  {
  return Create();
  }

src/Cli/dotnet/CommandFactory/CommandResolver.cs

@@ -33,20 +33,21 @@ public static CommandSpec TryResolveCommandSpec(
  NuGetFramework framework = null,
  string configuration = Constants.DefaultConfiguration,
  string outputPath = null,
- string applicationName = null)
+ string applicationName = null,
+ string currentWorkingDirectory = null)
  {
  var commandResolverArgs = new CommandResolverArguments
  {
  CommandName = commandName,
  CommandArguments = args,
  Framework = framework,
- ProjectDirectory = Directory.GetCurrentDirectory(),
+ ProjectDirectory = currentWorkingDirectory ?? Directory.GetCurrentDirectory(),
  Configuration = configuration,
  OutputPath = outputPath,
  ApplicationName = applicationName
  };
 
- var defaultCommandResolver = commandResolverPolicy.CreateCommandResolver();
+ var defaultCommandResolver = commandResolverPolicy.CreateCommandResolver(currentWorkingDirectory);
 
  return defaultCommandResolver.Resolve(commandResolverArgs);
  }

src/Cli/dotnet/DotNetCommandFactory.cs

@@ -12,10 +12,12 @@ namespace Microsoft.DotNet.Cli
  public class DotNetCommandFactory : ICommandFactory
  {
  private bool _alwaysRunOutOfProc;
+ private readonly string _currentWorkingDirectory;
 
- public DotNetCommandFactory(bool alwaysRunOutOfProc = false)
+ public DotNetCommandFactory(bool alwaysRunOutOfProc = false, string currentWorkingDirectory = null)
  {
  _alwaysRunOutOfProc = alwaysRunOutOfProc;
+ _currentWorkingDirectory = currentWorkingDirectory;
  }
 
  public ICommand Create(
@@ -32,7 +34,7 @@ public ICommand Create(
  return new BuiltInCommand(commandName, args, builtInCommand);
  }
 
- return CommandFactoryUsingResolver.CreateDotNet(commandName, args, framework, configuration);
+ return CommandFactoryUsingResolver.CreateDotNet(commandName, args, framework, configuration, _currentWorkingDirectory);
  }
 
  private bool TryGetBuiltInCommand(string commandName, out Func<string[], int> commandFunc)

src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs

@@ -74,10 +74,10 @@ internal bool IsFirstParty(FilePath nupkgToVerify)
  }
  }
 
- public static bool NuGetVerify(FilePath nupkgToVerify, out string commandOutput)
+ public static bool NuGetVerify(FilePath nupkgToVerify, out string commandOutput, string currentWorkingDirectory = null)
  {
  var args = new[] { "verify", "--all", nupkgToVerify.Value };
- var command = new DotNetCommandFactory(alwaysRunOutOfProc: true)
+ var command = new DotNetCommandFactory(alwaysRunOutOfProc: true, currentWorkingDirectory)
  .Create("nuget", args);
 
  var commandResult = command.CaptureStdOut().Execute();

src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs

@@ -40,6 +40,7 @@ internal class NuGetPackageDownloader : INuGetPackageDownloader
 
  private bool _verifySignatures;
  private VerbosityOptions _verbosityOptions;
+ private readonly string _currentWorkingDirectory;
 
  public NuGetPackageDownloader(
  DirectoryPath packageInstallDir,
@@ -51,8 +52,10 @@ public NuGetPackageDownloader(
  Func<IEnumerable<Task>> timer = null,
  bool verifySignatures = false,
  bool shouldUsePackageSourceMapping = false,
- VerbosityOptions verbosityOptions = VerbosityOptions.normal)
+ VerbosityOptions verbosityOptions = VerbosityOptions.normal,
+ string currentWorkingDirectory = null)
  {
+ _currentWorkingDirectory = currentWorkingDirectory;
  _packageInstallDir = packageInstallDir;
  _reporter = reporter ?? Reporter.Output;
  _verboseLogger = verboseLogger ?? new NuGetConsoleLogger();
@@ -160,7 +163,7 @@ await repository.GetResourceAsync<RepositorySignatureResource>().ConfigureAwait(
  {
  string commandOutput;
  if ((!_shouldUsePackageSourceMapping && !_firstPartyNuGetPackageSigningVerifier.Verify(new FilePath(nupkgPath), out commandOutput)) ||
- (_shouldUsePackageSourceMapping && !FirstPartyNuGetPackageSigningVerifier.NuGetVerify(new FilePath(nupkgPath), out commandOutput)))
+ (_shouldUsePackageSourceMapping && !FirstPartyNuGetPackageSigningVerifier.NuGetVerify(new FilePath(nupkgPath), out commandOutput, _currentWorkingDirectory)))
  {
  throw new NuGetPackageInstallerException(string.Format(LocalizableStrings.FailedToValidatePackageSigning, commandOutput));
  }
@@ -315,7 +318,7 @@ private static bool PackageIsInAllowList(IEnumerable<string> files)
  private IEnumerable<PackageSource> LoadNuGetSources(PackageId packageId, PackageSourceLocation packageSourceLocation = null, PackageSourceMapping packageSourceMapping = null)
  {
  List<PackageSource> defaultSources = new List<PackageSource>();
- string currentDirectory = Directory.GetCurrentDirectory();
+ string currentDirectory = _currentWorkingDirectory ?? Directory.GetCurrentDirectory();
  ISettings settings;
  if (packageSourceLocation?.NugetConfig != null)
  {

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

@@ -48,15 +48,19 @@ internal class ToolPackageDownloader : IToolPackageDownloader
 
  protected readonly string _runtimeJsonPath;
 
+ private readonly string _currentWorkingDirectory;
+
  public ToolPackageDownloader(
  IToolPackageStore store,
- string runtimeJsonPathForTests = null
+ string runtimeJsonPathForTests = null,
+ string currentWorkingDirectory = null
  )
  {
  _toolPackageStore = store ?? throw new ArgumentNullException(nameof(store));
  _globalToolStageDir = _toolPackageStore.GetRandomStagingDirectory();
- ISettings settings = Settings.LoadDefaultSettings(Directory.GetCurrentDirectory());
+ ISettings settings = Settings.LoadDefaultSettings(currentWorkingDirectory ?? Directory.GetCurrentDirectory());
  _localToolDownloadDir = new DirectoryPath(SettingsUtility.GetGlobalPackagesFolder(settings));
+ _currentWorkingDirectory = currentWorkingDirectory;
 
  _localToolAssetDir = new DirectoryPath(PathUtilities.CreateTempSubdirectory());
  _runtimeJsonPath = runtimeJsonPathForTests ?? Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "RuntimeIdentifierGraph.json");
@@ -92,7 +96,7 @@ public IToolPackage InstallPackage(PackageLocation packageLocation, PackageId pa
  var toolDownloadDir = isGlobalTool ? _globalToolStageDir : _localToolDownloadDir;
  var assetFileDirectory = isGlobalTool ? _globalToolStageDir : _localToolAssetDir;
 
- var nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(toolDownloadDir, verboseLogger: nugetLogger, verifySignatures: verifySignatures, shouldUsePackageSourceMapping: true, verbosityOptions: verbosity);
+ var nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(toolDownloadDir, verboseLogger: nugetLogger, verifySignatures: verifySignatures, shouldUsePackageSourceMapping: true, verbosityOptions: verbosity, currentWorkingDirectory: _currentWorkingDirectory);
 
  var packageSourceLocation = new PackageSourceLocation(packageLocation.NugetConfig, packageLocation.RootConfigDirectory, null, packageLocation.AdditionalFeeds);
 

src/Cli/dotnet/ToolPackage/ToolPackageFactory.cs

@@ -36,18 +36,18 @@ public static (IToolPackageStore,
  IToolPackageDownloader,
  IToolPackageUninstaller)
  CreateToolPackageStoresAndDownloaderAndUninstaller(
- DirectoryPath? nonGlobalLocation = null, IEnumerable<string> additionalRestoreArguments = null)
+ DirectoryPath? nonGlobalLocation = null, IEnumerable<string> additionalRestoreArguments = null, string currentWorkingDirectory = null)
  {
  ToolPackageStoreAndQuery toolPackageStore = CreateConcreteToolPackageStore(nonGlobalLocation);
- var toolPackageDownloader = new ToolPackageDownloader(toolPackageStore);
+ var toolPackageDownloader = new ToolPackageDownloader(toolPackageStore, currentWorkingDirectory: currentWorkingDirectory);
  var toolPackageUninstaller = new ToolPackageUninstaller(
  toolPackageStore);
 
  return (toolPackageStore, toolPackageStore, toolPackageDownloader, toolPackageUninstaller);
  }
 
 
- public static IToolPackageStoreQuery CreateToolPackageStoreQuery(
+ public static ToolPackageStoreAndQuery CreateToolPackageStoreQuery(
  DirectoryPath? nonGlobalLocation = null)
  {
  return CreateConcreteToolPackageStore(nonGlobalLocation);

src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs

@@ -52,7 +52,8 @@ internal class ToolInstallGlobalOrToolPathCommand : CommandBase
  private readonly bool _allowRollForward;
  private readonly bool _allowPackageDowngrade;
  private readonly bool _updateAll;
-
+ private readonly string _currentWorkingDirectory;
+ private readonly bool? _verifySignatures;
 
  public ToolInstallGlobalOrToolPathCommand(
  ParseResult parseResult,
@@ -62,9 +63,13 @@ public ToolInstallGlobalOrToolPathCommand(
  IEnvironmentPathInstruction environmentPathInstruction = null,
  IReporter reporter = null,
  INuGetPackageDownloader nugetPackageDownloader = null,
- IToolPackageStoreQuery store = null)
+ IToolPackageStoreQuery store = null,
+ string currentWorkingDirectory = null,
+ bool? verifySignatures = null)
  : base(parseResult)
  {
+ _verifySignatures = verifySignatures;
+ _currentWorkingDirectory = currentWorkingDirectory;
  var packageIdArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdArgument);
  _packageId = packageId ?? (packageIdArgument is not null ? new PackageId(packageIdArgument) : null);
  _packageVersion = parseResult.GetValue(ToolInstallCommandParser.VersionOption);
@@ -151,7 +156,7 @@ private int ExecuteInstallCommand(PackageId packageId)
  (IToolPackageStore toolPackageStore,
  IToolPackageStoreQuery toolPackageStoreQuery,
  IToolPackageDownloader toolPackageDownloader,
- IToolPackageUninstaller toolPackageUninstaller) = _createToolPackageStoreDownloaderUninstaller(toolPath, _forwardRestoreArguments);
+ IToolPackageUninstaller toolPackageUninstaller) = _createToolPackageStoreDownloaderUninstaller(toolPath, _forwardRestoreArguments, _currentWorkingDirectory);
 
  var appHostSourceDirectory = ShellShimTemplateFinder.GetDefaultAppHostSourceDirectory();
  IShellShimRepository shellShimRepository = _createShellShimRepository(appHostSourceDirectory, toolPath);
@@ -195,7 +200,8 @@ private int ExecuteInstallCommand(PackageId packageId)
  targetFramework: _framework,
  verbosity: _verbosity,
  isGlobalTool: true,
- isGlobalToolRollForward: _allowRollForward
+ isGlobalToolRollForward: _allowRollForward,
+ verifySignatures: _verifySignatures ?? true
  );
 
  EnsureVersionIsHigher(oldPackageNullable, newInstalledPackage, _allowPackageDowngrade);

src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs

@@ -16,7 +16,8 @@ namespace Microsoft.DotNet.Tools.Tool.Update
 {
  internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageDownloader, IToolPackageUninstaller) CreateToolPackageStoresAndDownloaderAndUninstaller(
  DirectoryPath? nonGlobalLocation = null,
- IEnumerable<string> additionalRestoreArguments = null);
+ IEnumerable<string> additionalRestoreArguments = null,
+ string currentWorkingDirectory = null);
 
  internal class ToolUpdateGlobalOrToolPathCommand : CommandBase
  {

test/dotnet.Tests/CommandObjectTests.cs

@@ -28,7 +28,7 @@ public void WhenItCannotResolveCommandButCommandIsInListOfKnownToolsItThrows()
 
  private class ResolveNothingCommandResolverPolicy : ICommandResolverPolicy
  {
- public CompositeCommandResolver CreateCommandResolver()
+ public CompositeCommandResolver CreateCommandResolver(string currentWorkingDirectory = null)
  {
  var compositeCommandResolver = new CompositeCommandResolver();
  compositeCommandResolver.AddCommandResolver(new ResolveNothingCommandResolver());