Update test baselines

Chet Husk · Chet Husk · commit ba60b0a5c9f4 · 2025-11-09T18:55:20.000-06:00
diff --git a/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs b/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs
@@ -464,7 +464,7 @@ public void ShortFormForLaunchProfileArgumentWorks()
         [InlineData(new[] { "--sc" }, new[] { NugetInteractiveProperty, "--property:SelfContained=true", "--property:_CommandLineDefinedSelfContained=true" })]
         [InlineData(new[] { "--self-contained" }, new[] { NugetInteractiveProperty, "--property:SelfContained=true", "--property:_CommandLineDefinedSelfContained=true" })]
         [InlineData(new[] { "--no-self-contained" }, new[] { NugetInteractiveProperty, "--property:SelfContained=false", "--property:_CommandLineDefinedSelfContained=true" })]
-        [InlineData(new[] { "--verbosity", "q" }, new[] { NugetInteractiveProperty, "--verbosity:q" })]
+        [InlineData(new[] { "--verbosity", "q" }, new[] { NugetInteractiveProperty, "--verbosity:quiet" })]
         [InlineData(new[] { "--arch", "arm", "--os", "win" }, new[] { NugetInteractiveProperty, "--property:RuntimeIdentifier=win-arm" })]
         [InlineData(new[] { "--disable-build-servers" }, new[] { NugetInteractiveProperty, "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
         [InlineData(new[] { "-bl" }, new[] { NugetInteractiveProperty, "-bl" })]
diff --git a/test/dotnet.Tests/CliSchemaTests.cs b/test/dotnet.Tests/CliSchemaTests.cs
@@ -258,7 +258,11 @@ public CliSchemaTests(ITestOutputHelper log) : base(log)
       "description": "Set the MSBuild verbosity level. Allowed values are: quiet, q, minimal, m, normal, n, detailed, d, diagnostic, diag.",
       "hidden": false,
       "aliases": [
-        "-v"
+        "--v",
+        "-v",
+        "-verbosity",
+        "/v",
+        "/verbosity"
       ],
       "helpName": "LEVEL",
       "valueType": "Microsoft.DotNet.Cli.Utils.Verbosity",
@@ -431,6 +435,7 @@ public CliSchemaTests(ITestOutputHelper log) : base(log)
 }
 """;
 
+    
     private static readonly string WorkloadInstallJson = $$"""
 {
   "name": "install",
@@ -663,7 +668,11 @@ public CliSchemaTests(ITestOutputHelper log) : base(log)
       "description": "Set the MSBuild verbosity level. Allowed values are: quiet, q, minimal, m, normal, n, detailed, d, diagnostic, diag.",
       "hidden": false,
       "aliases": [
-        "-v"
+        "--v",
+        "-v",
+        "-verbosity",
+        "/v",
+        "/verbosity"
       ],
       "helpName": "LEVEL",
       "valueType": "Microsoft.DotNet.Cli.Utils.Verbosity",
diff --git a/test/dotnet.Tests/CommandTests/Hidden/Complete/CompleteCommandTests.cs b/test/dotnet.Tests/CommandTests/Hidden/Complete/CompleteCommandTests.cs
@@ -56,7 +56,7 @@ public void GivenOnlyDotnetItSuggestsTopLevelCommandsAndOptions()
 
             var reporter = new BufferedReporter();
             CompleteCommand.RunWithReporter(new[] { "dotnet " }, reporter).Should().Be(0);
-            reporter.Lines.OrderBy(c => c).Should().Equal(expected.OrderBy(c => c));
+            reporter.Lines.Should().BeEquivalentTo(expected);
         }
 
         [Fact]
@@ -221,8 +221,12 @@ public void GivenNuGetVerifyCommandItDisplaysCompletions()
                 "--all",
                 "--certificate-fingerprint",
                 "--verbosity",
-                "--help",
+                "-verbosity",
+                "/verbosity",
                 "-v",
+                "/v",
+                "--v",
+                "--help",
                 "-?",
                 "-h",
                 "/?",
@@ -240,8 +244,12 @@ public void GivenNuGetTrustCommandItDisplaysCompletions()
             var expected = new[] {
                 "--configfile",
                 "--verbosity",
-                "--help",
+                "-verbosity",
+                "/verbosity",
                 "-v",
+                "/v",
+                "--v",
+                "--help",
                 "-?",
                 "-h",
                 "/?",
@@ -274,11 +282,15 @@ public void GivenNuGetSignCommandItDisplaysCompletions()
                 "--timestamper",
                 "--timestamp-hash-algorithm",
                 "--verbosity",
+                "-verbosity",
+                "/verbosity",
+                "-v",
+                "/v",
+                "--v",
                 "--output",
                 "--overwrite",
                 "-o",
                 "--help",
-                "-v",
                 "-?",
                 "-h",
                 "/?",
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs
@@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];
+        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo"];
         public static string[] RestoreExpectedPrefixForImplicitRestore = [.. RestoringCommand.RestoreOptimizationProperties.Select(kvp => $"--restoreProperty:{kvp.Key}={kvp.Value}")];
         public static string[] RestoreExpectedPrefixForSeparateRestore = [.. RestoringCommand.RestoreOptimizationProperties.Select(kvp => $"--property:{kvp.Key}={kvp.Value}")];
 
@@ -37,10 +37,10 @@ public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixt
         [InlineData(new string[] { "--configuration", "config" }, new string[] { "--property:Configuration=config" })]
         [InlineData(new string[] { "--version-suffix", "mysuffix" }, new string[] { "--property:VersionSuffix=mysuffix" })]
         [InlineData(new string[] { "--no-dependencies" }, new string[] { "--property:BuildProjectReferences=false" })]
-        [InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diag" })]
-        [InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diag" })]
+        [InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diagnostic" })]
+        [InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diagnostic" })]
         [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
-                   new string[] { "--target:Rebuild", "--property:RuntimeIdentifier=myruntime", "--property:_CommandLineDefinedRuntimeIdentifier=true", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
+                   new string[] { "--target:Rebuild", "--property:RuntimeIdentifier=myruntime", "--property:_CommandLineDefinedRuntimeIdentifier=true", "--verbosity:diagnostic", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
         [InlineData(new string[] { "/t:CustomTarget" }, new string[] { "--target:CustomTarget" })]
         [InlineData(new string[] { "--disable-build-servers" }, new string[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
         public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditionalArgs)
@@ -89,8 +89,8 @@ public void NoRestoreMeansNoSeparateRestoreCommand()
             new string[] { "--target:Restore", "-tlp:verbosity=quiet" },
             new string[] { "--property:TargetFramework=tfm", "--target:Run" })]
         [InlineData(new string[] { "-o", "myoutput", "-f", "tfm", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
-            new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" },
-            new string[] { "--property:TargetFramework=tfm", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
+            new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--verbosity:diagnostic", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" },
+            new string[] { "--property:TargetFramework=tfm", "--verbosity:diagnostic", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
         [InlineData(new string[] { "-f", "tfm", "-getItem:Compile", "-getProperty:TargetFramework", "-getTargetResult:Build" },
             new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--nologo", "--verbosity:quiet" },
             new string[] { "--property:TargetFramework=tfm", "--getItem:Compile", "--getProperty:TargetFramework", "--getTargetResult:Build" })]
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     public class GivenDotnetCleanInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
         private const string NugetInteractiveProperty = "--property:NuGetInteractive=false";
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--verbosity:normal", "--target:Clean", NugetInteractiveProperty];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--verbosity:normal", "--target:Clean", NugetInteractiveProperty];
 
 
         private static readonly string WorkingDirectory =
@@ -42,9 +42,9 @@ public void ItAddsProjectToMsbuildInvocation()
         [InlineData(new string[] { "--configuration", "<configuration>" },
             new string[] { "--property:Configuration=<configuration>" })]
         [InlineData(new string[] { "-v", "diag" },
-            new string[] { "--verbosity:diag" })]
+            new string[] { "--verbosity:diagnostic" })]
         [InlineData(new string[] { "--verbosity", "diag" },
-            new string[] { "--verbosity:diag" })]
+            new string[] { "--verbosity:diagnostic" })]
         [InlineData(new string[] { "--disable-build-servers" },
             new string[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
         public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditionalArgs)
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetMSBuildInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetMSBuildInvocation.cs
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetMSBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ExpectedPrefix = [ "-maxcpucount", "--verbosity:m", "-tlp:default=auto" ];
+        private static readonly string[] ExpectedPrefix = [ "-maxcpucount", "--verbosity:minimal", "-tlp:default=auto" ];
         private static readonly string WorkingDirectory = TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetPackInvocation));
 
         [Theory]
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetOsArchOptions.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetOsArchOptions.cs
@@ -14,7 +14,7 @@ public GivenDotnetOsArchOptions(ITestOutputHelper log) : base(log)
         {
         }
 
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo"];
         private const string NugetInteractiveProperty = "--property:NuGetInteractive=false";
         private static readonly string[] DefaultArgs = ["-restore", "-consoleloggerparameters:Summary", NugetInteractiveProperty];
 
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPackInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPackInvocation.cs
@@ -8,8 +8,8 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetPackInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "-restore", "--target:Pack"];
-        private static readonly string[] ExpectedNoBuildPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:Pack"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "-restore", "--target:Pack"];
+        private static readonly string[] ExpectedNoBuildPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--target:Pack"];
         private readonly string[] ExpectedProperties = ["--property:_IsPacking=true", "--property:NuGetInteractive=false"];
 
         private static readonly string WorkingDirectory =
@@ -28,8 +28,8 @@ public class GivenDotnetPackInvocation : IClassFixture<NullCurrentSessionIdFixtu
         [InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, new string[] { "--property:VersionSuffix=<versionsuffix>" })]
         [InlineData(new string[] { "-s" }, new string[] { "--property:Serviceable=true" })]
         [InlineData(new string[] { "--serviceable" }, new string[] { "--property:Serviceable=true" })]
-        [InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diag" })]
-        [InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diag" })]
+        [InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diagnostic" })]
+        [InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diagnostic" })]
         [InlineData(new string[] { "<project>" }, new string[] { "<project>" })]
         [InlineData(new string[] { "--disable-build-servers" }, new string[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
         public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditionalArgs)
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs
@@ -17,7 +17,7 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output)
             this.output = output;
         }
 
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo"];
         private static readonly string[] ExpectedProperties = ["--property:_IsPublishing=true"];
         private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";
 
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetRestoreInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:Restore"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--target:Restore"];
         private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";
         private static readonly string WorkingDirectory =
             TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetRestoreInvocation));
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetStoreInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:ComposeStore", "<project>"];
+        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--target:ComposeStore", "<project>"];
         static readonly string[] ArgsPrefix = ["--manifest", "<project>"];
         private static readonly string WorkingDirectory =
             TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetStoreInvocation));
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetTestInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetTestInvocation.cs
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetTestInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "-restore", "-target:VSTest", "-property:NuGetInteractive=false"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "-restore", "-target:VSTest", "-property:NuGetInteractive=false"];
 
         private static readonly string WorkingDirectory =
             TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetTestInvocation));
diff --git a/test/dotnet.Tests/CommandTests/Package/List/ListPackageParserTests.cs b/test/dotnet.Tests/CommandTests/Package/List/ListPackageParserTests.cs
@@ -18,43 +18,6 @@ public void ListPackageCanForwardInteractiveFlag()
             result.Errors.Should().BeEmpty();
         }
 
-        [Theory]
-        [InlineData("--verbosity", "foo")]
-        [InlineData("--verbosity", "")]
-        [InlineData("-v", "foo")]
-        [InlineData("-v", "")]
-        public void ListPackageRejectsInvalidVerbosityFlags(string inputOption, string value)
-        {
-            var result = Parser.Parse(["dotnet", "list", "package", inputOption, value]);
-
-            result.Errors.Should().NotBeEmpty();
-        }
-
-        [Theory]
-        [InlineData("--verbosity", "q")]
-        [InlineData("--verbosity", "quiet")]
-        [InlineData("--verbosity", "m")]
-        [InlineData("--verbosity", "minimal")]
-        [InlineData("--verbosity", "n")]
-        [InlineData("--verbosity", "normal")]
-        [InlineData("--verbosity", "d")]
-        [InlineData("--verbosity", "detailed")]
-        [InlineData("--verbosity", "diag")]
-        [InlineData("--verbosity", "diagnostic")]
-        [InlineData("--verbosity", "QUIET")]
-        [InlineData("-v", "q")]
-        [InlineData("-v", "QUIET")]
-        public void ListPackageCanForwardVerbosityFlag(string inputOption, string value)
-        {
-            var result = Parser.Parse(["dotnet", "list", "package", inputOption, value]);
-
-            result
-                .OptionValuesToBeForwarded(ListPackageCommandParser.GetCommand())
-                .Should()
-                .Contain($"--verbosity:{value.ToLowerInvariant()}");
-            result.Errors.Should().BeEmpty();
-        }
-
         [Fact]
         public void ListPackageDoesNotForwardVerbosityByDefault()
         {
diff --git a/test/dotnet.Tests/CommandTests/Test/snapshots/MTPHelpSnapshotTests.VerifyMTPHelpOutput.verified.txt b/test/dotnet.Tests/CommandTests/Test/snapshots/MTPHelpSnapshotTests.VerifyMTPHelpOutput.verified.txt
@@ -30,7 +30,7 @@ Options:
   -f, --framework <FRAMEWORK>                     The target framework to run tests for. The target framework must also be specified in the project file.
   --os <OS>                                       The target operating system.
   -r, --runtime <RUNTIME_IDENTIFIER>              The target runtime to test for.
-  -v, -verbosity <LEVEL>                          Set the MSBuild verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].
+  -v, -verbosity <LEVEL>                          Set the MSBuild verbosity level. Allowed values are: quiet, q, minimal, m, normal, n, detailed, d, diagnostic, diag.
   --no-restore                                    Do not restore the project before building. [default: False]
   --no-build                                      Do not build the project before testing. Implies --no-restore. [default: False]
   --no-ansi                                       Disable ANSI output. [default: False]
diff --git a/test/dotnet.Tests/CommandTests/Tool/Install/InstallToolParserTests.cs b/test/dotnet.Tests/CommandTests/Tool/Install/InstallToolParserTests.cs
@@ -100,7 +100,7 @@ public void InstallToolParserCanGetManifestOption()
         [Fact]
         public void InstallToolParserCanParseVerbosityOption()
         {
-            const string expectedVerbosityLevel = "diag";
+            const string expectedVerbosityLevel = "diagnotic";
 
             var result = Parser.Parse($"dotnet tool install -g --verbosity:{expectedVerbosityLevel} console.test.app");
 
diff --git a/test/dotnet.Tests/CommandTests/Tool/Restore/ToolRestoreParserTests.cs b/test/dotnet.Tests/CommandTests/Tool/Restore/ToolRestoreParserTests.cs
@@ -65,7 +65,7 @@ public void ToolRestoreParserCanParseMultipleSourceOption()
         [Fact]
         public void ToolRestoreParserCanParseVerbosityOption()
         {
-            const string expectedVerbosityLevel = "diag";
+            const string expectedVerbosityLevel = "diagnostic";
 
             var result = Parser.Parse($"dotnet tool restore --verbosity {expectedVerbosityLevel}");
 
diff --git a/test/dotnet.Tests/CommandTests/Tool/Update/UpdateToolParserTests.cs b/test/dotnet.Tests/CommandTests/Tool/Update/UpdateToolParserTests.cs
@@ -92,7 +92,7 @@ public void UpdateToolParserCanParseMultipleSourceOption()
         [Fact]
         public void UpdateToolParserCanParseVerbosityOption()
         {
-            const string expectedVerbosityLevel = "diag";
+            const string expectedVerbosityLevel = "diagnostic";
 
             var result =
                 Parser.Parse($"dotnet tool update -g --verbosity:{expectedVerbosityLevel} console.test.app");
diff --git a/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh b/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests`
`8`	`8`	`[Collection(TestConstants.UsesStaticTelemetryState)]`
`9`	`9`	`public class GivenDotnetMSBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>`
`10`	`10`	`{`
`11`		`- private static readonly string[] ExpectedPrefix = [ "-maxcpucount", "--verbosity:m", "-tlp:default=auto" ];`
	`11`	`+ private static readonly string[] ExpectedPrefix = [ "-maxcpucount", "--verbosity:minimal", "-tlp:default=auto" ];`
`12`	`12`	`private static readonly string WorkingDirectory = TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetPackInvocation));`
`13`	`13`
`14`	`14`	`[Theory]`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public GivenDotnetOsArchOptions(ITestOutputHelper log) : base(log)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`- private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];`
	`17`	`+ private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo"];`
`18`	`18`	`private const string NugetInteractiveProperty = "--property:NuGetInteractive=false";`
`19`	`19`	`private static readonly string[] DefaultArgs = ["-restore", "-consoleloggerparameters:Summary", NugetInteractiveProperty];`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output)`
`17`	`17`	`this.output = output;`
`18`	`18`	`}`
`19`	`19`
`20`		`- private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];`
	`20`	`+ private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo"];`
`21`	`21`	`private static readonly string[] ExpectedProperties = ["--property:_IsPublishing=true"];`
`22`	`22`	`private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests`
`9`	`9`	`[Collection(TestConstants.UsesStaticTelemetryState)]`
`10`	`10`	`public class GivenDotnetRestoreInvocation : IClassFixture<NullCurrentSessionIdFixture>`
`11`	`11`	`{`
`12`		`- private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:Restore"];`
	`12`	`+ private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--target:Restore"];`
`13`	`13`	`private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";`
`14`	`14`	`private static readonly string WorkingDirectory =`
`15`	`15`	`TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetRestoreInvocation));`