Skip to content

Commit b61fe9c

Browse files
marcpopMSFTmarcpopMSFT
authored
[Issue #35173] --verbosity quiet suppress success message (#36505)
2 parents f017723 + 464619e commit b61fe9c

File tree

5 files changed

+50
-21
lines changed

5 files changed

+50
-21
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,16 @@ public override int Execute()
170170
_environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist();
171171
}
172172

173-
_reporter.WriteLine(
174-
string.Format(
175-
LocalizableStrings.InstallationSucceeded,
176-
string.Join(", ", package.Commands.Select(c => c.Name)),
177-
package.Id,
178-
package.Version.ToNormalizedString()).Green());
173+
if (!_verbosity.IsQuiet())
174+
{
175+
_reporter.WriteLine(
176+
string.Format(
177+
LocalizableStrings.InstallationSucceeded,
178+
string.Join(", ", package.Commands.Select(c => c.Name)),
179+
package.Id,
180+
package.Version.ToNormalizedString()).Green());
181+
}
182+
179183
return 0;
180184
}
181185
catch (Exception ex) when (InstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,10 @@ public override int Execute()
120120
{
121121
shellShimRepository.CreateShim(command.Executable, command.Name, newInstalledPackage.PackagedShims);
122122
}
123-
124-
PrintSuccessMessage(oldPackageNullable, newInstalledPackage);
123+
if (!_verbosity.IsQuiet())
124+
{
125+
PrintSuccessMessage(oldPackageNullable, newInstalledPackage);
126+
}
125127
});
126128

127129
scope.Complete();

‎src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public ToolInstallGlobalOrToolPathCommandTests(ITestOutputHelper log): base(log)
6060
_createToolPackageStoresAndDownloader = (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, CreateToolPackageDownloader());
6161

6262

63-
_parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId}");
63+
_parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --verbosity minimal");
6464
}
6565

6666
[Fact]
@@ -282,6 +282,29 @@ public void WhenRunWithPackageIdItShouldShowSuccessMessage()
282282
PackageVersion).Green());
283283
}
284284

285+
[Fact]
286+
public void WhenRunWithPackageIdWithQuietItShouldShowNoSuccessMessage()
287+
{
288+
var parseResultQuiet = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --verbosity quiet");
289+
var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand(
290+
parseResultQuiet,
291+
_createToolPackageStoresAndDownloader,
292+
_createShellShimRepository,
293+
new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true),
294+
_reporter);
295+
296+
toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0);
297+
298+
_reporter
299+
.Lines
300+
.Should()
301+
.NotContain(string.Format(
302+
LocalizableStrings.InstallationSucceeded,
303+
ToolCommandName,
304+
PackageId,
305+
PackageVersion).Green());
306+
}
307+
285308
[Fact]
286309
public void WhenRunWithInvalidVersionItShouldThrow()
287310
{
@@ -307,7 +330,7 @@ public void WhenRunWithInvalidVersionItShouldThrow()
307330
[Fact]
308331
public void WhenRunWithExactVersionItShouldSucceed()
309332
{
310-
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion}");
333+
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion} --verbosity minimal");
311334

312335
var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand(
313336
result,
@@ -331,7 +354,7 @@ public void WhenRunWithExactVersionItShouldSucceed()
331354
[Fact]
332355
public void WhenRunWithValidVersionRangeItShouldSucceed()
333356
{
334-
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version [1.0,2.0]");
357+
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version [1.0,2.0] --verbosity minimal");
335358

336359
var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand(
337360
result,
@@ -404,7 +427,7 @@ public void WhenRunWithPrereleaseItShouldSucceed()
404427
{
405428
IToolPackageDownloader toolToolPackageDownloader = GetToolToolPackageDownloaderWithPreviewInFeed();
406429

407-
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --prerelease");
430+
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --prerelease --verbosity minimal");
408431

409432
var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand(
410433
result,
@@ -496,7 +519,7 @@ public void WhenRunWithoutAMatchingRangeItShouldFail()
496519
[Fact]
497520
public void WhenRunWithValidVersionWildcardItShouldSucceed()
498521
{
499-
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version 1.0.*");
522+
ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version 1.0.* --verbosity minimal");
500523

501524
var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand(
502525
result,

‎src/Tests/dotnet.Tests/CommandTests/ToolUninstallGlobalOrToolPathCommandTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void GivenANonExistentPackageItErrors()
5656
[Fact]
5757
public void GivenAPackageItUninstalls()
5858
{
59-
CreateInstallCommand($"-g {PackageId}").Execute().Should().Be(0);
59+
CreateInstallCommand($"-g {PackageId} --verbosity minimal").Execute().Should().Be(0);
6060

6161
_reporter
6262
.Lines
@@ -98,7 +98,7 @@ public void GivenAPackageItUninstalls()
9898
[Fact]
9999
public void GivenAPackageWhenCallFromUninstallRedirectCommandItUninstalls()
100100
{
101-
CreateInstallCommand($"-g {PackageId}").Execute().Should().Be(0);
101+
CreateInstallCommand($"-g {PackageId} --verbosity minimal").Execute().Should().Be(0);
102102

103103
_reporter
104104
.Lines
@@ -168,7 +168,7 @@ var uninstallCommand
168168
[Fact]
169169
public void GivenAFailureToUninstallItLeavesItInstalled()
170170
{
171-
CreateInstallCommand($"-g {PackageId}").Execute().Should().Be(0);
171+
CreateInstallCommand($"-g {PackageId} --verbosity minimal").Execute().Should().Be(0);
172172

173173
_reporter
174174
.Lines

‎src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void GivenAnExistedLowerversionInstallationWhenCallItCanPrintSuccessMessa
143143
CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute();
144144
_reporter.Lines.Clear();
145145

146-
var command = CreateUpdateCommand($"-g {_packageId}");
146+
var command = CreateUpdateCommand($"-g {_packageId} --verbosity minimal");
147147

148148
command.Execute();
149149

@@ -158,7 +158,7 @@ public void GivenAnExistedLowerversionInstallationWhenCallWithWildCardVersionItC
158158
CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute();
159159
_reporter.Lines.Clear();
160160

161-
var command = CreateUpdateCommand($"-g {_packageId} --version 1.0.5-*");
161+
var command = CreateUpdateCommand($"-g {_packageId} --version 1.0.5-* --verbosity minimal");
162162

163163
command.Execute();
164164

@@ -173,7 +173,7 @@ public void GivenAnExistedLowerversionInstallationWhenCallWithPrereleaseVersionI
173173
CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute();
174174
_reporter.Lines.Clear();
175175

176-
var command = CreateUpdateCommand($"-g {_packageId} --prerelease");
176+
var command = CreateUpdateCommand($"-g {_packageId} --prerelease --verbosity minimal");
177177

178178
command.Execute();
179179

@@ -208,7 +208,7 @@ public void GivenAnExistedSameVersionInstallationWhenCallItCanPrintSuccessMessag
208208
CreateInstallCommand($"-g {_packageId} --version {HigherPackageVersion}").Execute();
209209
_reporter.Lines.Clear();
210210

211-
var command = CreateUpdateCommand($"-g {_packageId}");
211+
var command = CreateUpdateCommand($"-g {_packageId} --verbosity minimal");
212212

213213
command.Execute();
214214

@@ -223,7 +223,7 @@ public void GivenAnExistedSameVersionInstallationWhenCallWithPrereleaseItUsesAPr
223223
CreateInstallCommand($"-g {_packageId} --version {HigherPreviewPackageVersion}").Execute();
224224
_reporter.Lines.Clear();
225225

226-
var command = CreateUpdateCommand($"-g {_packageId} --version {HigherPreviewPackageVersion}");
226+
var command = CreateUpdateCommand($"-g {_packageId} --version {HigherPreviewPackageVersion} --verbosity minimal");
227227

228228
command.Execute();
229229

0 commit comments

Comments
 (0)