mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Reduce nuget output

Browse source 
This addresses part of #1623. Unfortunately, because the CLI takes Nuget
as a binary, it is hard to get to where I think we should really be.
This change makes default verbosity "minimal", which is the first level
where you get any status output. Unfortunately, things like package
downgrade warnings and the like still appear there. This does hide all
the "info" and "trace" messages by default.

I also removed the now useless (and previously undocumented)
--quiet.
This commit is contained in:
Bill Wert 2016-05-24 21:03:33 -07:00
parent 62afa28de4
commit 785cab3072
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dotnet/commands/dotnet-restore/NuGet3.cs
View file

@ -10,13 +10,13 @@ namespace Microsoft.DotNet.Tools.Restore
{ {
internal static class NuGet3 internal static class NuGet3
{ {
public static int Restore(IEnumerable<string> args, bool quiet) public static int Restore(IEnumerable<string> args)
{ {
var prefixArgs = new List<string>(); var prefixArgs = new List<string>();
if (quiet) if (!args.Any(s => s.Equals("--verbosity", StringComparison.OrdinalIgnoreCase) || s.Equals("-v", StringComparison.OrdinalIgnoreCase)))
{ {
prefixArgs.Add("--verbosity"); prefixArgs.Add("--verbosity");
prefixArgs.Add("Error"); prefixArgs.Add("minimal");
} }
prefixArgs.Add("restore"); prefixArgs.Add("restore");

6
src/dotnet/commands/dotnet-restore/Program.cs
View file

@ -24,16 +24,12 @@ namespace Microsoft.DotNet.Tools.Restore
Description = "Restores dependencies listed in project.json" Description = "Restores dependencies listed in project.json"
}; };
// Parse --quiet, because we have to handle that specially since NuGet3 has a different
// "--verbosity" switch that goes BEFORE the command
var quiet = args.Any(s => s.Equals("--quiet", StringComparison.OrdinalIgnoreCase));
args = args.Where(s => !s.Equals("--quiet", StringComparison.OrdinalIgnoreCase)).ToArray();
app.OnExecute(() => app.OnExecute(() =>
{ {
try try
{ {
return NuGet3.Restore(args, quiet); return NuGet3.Restore(args);
} }
catch (InvalidOperationException e) catch (InvalidOperationException e)
{ {

2
test/EndToEnd/EndToEndTest.cs
View file

@ -218,7 +218,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
Directory.SetCurrentDirectory(RestoredTestProjectDirectory); Directory.SetCurrentDirectory(RestoredTestProjectDirectory);
new NewCommand().Execute().Should().Pass(); new NewCommand().Execute().Should().Pass();
new RestoreCommand().Execute("--quiet").Should().Pass(); new RestoreCommand().Execute().Should().Pass();
Directory.SetCurrentDirectory(currentDirectory); Directory.SetCurrentDirectory(currentDirectory);
} }

2
test/Performance/HelloWorld.cs
View file

@ -81,7 +81,7 @@ namespace Microsoft.DotNet.Tests.Performance
var restoreCommand = new RestoreCommand(); var restoreCommand = new RestoreCommand();
restoreCommand.WorkingDirectory = RestoredTestProjectDirectory; restoreCommand.WorkingDirectory = RestoredTestProjectDirectory;
restoreCommand.Execute("--quiet").Should().Pass(); restoreCommand.Execute().Should().Pass();
} }
} }
} }