Skip to content

Commit 822fd03

Browse files
committed
Update test baselines
1 parent 1e8cf9e commit 822fd03

14 files changed

+23
-60
lines changed

test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ public void ShortFormForLaunchProfileArgumentWorks()
464464
[InlineData(new[] { "--sc" }, new[] { NugetInteractiveProperty, "--property:SelfContained=true", "--property:_CommandLineDefinedSelfContained=true" })]
465465
[InlineData(new[] { "--self-contained" }, new[] { NugetInteractiveProperty, "--property:SelfContained=true", "--property:_CommandLineDefinedSelfContained=true" })]
466466
[InlineData(new[] { "--no-self-contained" }, new[] { NugetInteractiveProperty, "--property:SelfContained=false", "--property:_CommandLineDefinedSelfContained=true" })]
467-
[InlineData(new[] { "--verbosity", "q" }, new[] { NugetInteractiveProperty, "--verbosity:q" })]
467+
[InlineData(new[] { "--verbosity", "q" }, new[] { NugetInteractiveProperty, "--verbosity:quiet" })]
468468
[InlineData(new[] { "--arch", "arm", "--os", "win" }, new[] { NugetInteractiveProperty, "--property:RuntimeIdentifier=win-arm" })]
469469
[InlineData(new[] { "--disable-build-servers" }, new[] { NugetInteractiveProperty, "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
470470
[InlineData(new[] { "-bl" }, new[] { NugetInteractiveProperty, "-bl" })]

test/dotnet.Tests/CommandTests/Hidden/Complete/CompleteCommandTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void GivenOnlyDotnetItSuggestsTopLevelCommandsAndOptions()
5656

5757
var reporter = new BufferedReporter();
5858
CompleteCommand.RunWithReporter(new[] { "dotnet " }, reporter).Should().Be(0);
59-
reporter.Lines.OrderBy(c => c).Should().Equal(expected.OrderBy(c => c));
59+
reporter.Lines.Should().BeEquivalentTo(expected);
6060
}
6161

6262
[Fact]

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
1111
[Collection(TestConstants.UsesStaticTelemetryState)]
1212
public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>
1313
{
14-
string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];
14+
string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo"];
1515
public static string[] RestoreExpectedPrefixForImplicitRestore = [.. RestoringCommand.RestoreOptimizationProperties.Select(kvp => $"--restoreProperty:{kvp.Key}={kvp.Value}")];
1616
public static string[] RestoreExpectedPrefixForSeparateRestore = [.. RestoringCommand.RestoreOptimizationProperties.Select(kvp => $"--property:{kvp.Key}={kvp.Value}")];
1717

@@ -37,10 +37,10 @@ public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixt
3737
[InlineData(new string[] { "--configuration", "config" }, new string[] { "--property:Configuration=config" })]
3838
[InlineData(new string[] { "--version-suffix", "mysuffix" }, new string[] { "--property:VersionSuffix=mysuffix" })]
3939
[InlineData(new string[] { "--no-dependencies" }, new string[] { "--property:BuildProjectReferences=false" })]
40-
[InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diag" })]
41-
[InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diag" })]
40+
[InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diagnostic" })]
41+
[InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diagnostic" })]
4242
[InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
43-
new string[] { "--target:Rebuild", "--property:RuntimeIdentifier=myruntime", "--property:_CommandLineDefinedRuntimeIdentifier=true", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
43+
new string[] { "--target:Rebuild", "--property:RuntimeIdentifier=myruntime", "--property:_CommandLineDefinedRuntimeIdentifier=true", "--verbosity:diagnostic", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
4444
[InlineData(new string[] { "/t:CustomTarget" }, new string[] { "--target:CustomTarget" })]
4545
[InlineData(new string[] { "--disable-build-servers" }, new string[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
4646
public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditionalArgs)
@@ -89,8 +89,8 @@ public void NoRestoreMeansNoSeparateRestoreCommand()
8989
new string[] { "--target:Restore", "-tlp:verbosity=quiet" },
9090
new string[] { "--property:TargetFramework=tfm", "--target:Run" })]
9191
[InlineData(new string[] { "-o", "myoutput", "-f", "tfm", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
92-
new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" },
93-
new string[] { "--property:TargetFramework=tfm", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
92+
new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--verbosity:diagnostic", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" },
93+
new string[] { "--property:TargetFramework=tfm", "--verbosity:diagnostic", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
9494
[InlineData(new string[] { "-f", "tfm", "-getItem:Compile", "-getProperty:TargetFramework", "-getTargetResult:Build" },
9595
new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--nologo", "--verbosity:quiet" },
9696
new string[] { "--property:TargetFramework=tfm", "--getItem:Compile", "--getProperty:TargetFramework", "--getTargetResult:Build" })]

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
99
public class GivenDotnetCleanInvocation : IClassFixture<NullCurrentSessionIdFixture>
1010
{
1111
private const string NugetInteractiveProperty = "--property:NuGetInteractive=false";
12-
private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--verbosity:normal", "--target:Clean", NugetInteractiveProperty];
12+
private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--verbosity:normal", "--target:Clean", NugetInteractiveProperty];
1313

1414

1515
private static readonly string WorkingDirectory =
@@ -42,9 +42,9 @@ public void ItAddsProjectToMsbuildInvocation()
4242
[InlineData(new string[] { "--configuration", "<configuration>" },
4343
new string[] { "--property:Configuration=<configuration>" })]
4444
[InlineData(new string[] { "-v", "diag" },
45-
new string[] { "--verbosity:diag" })]
45+
new string[] { "--verbosity:diagnostic" })]
4646
[InlineData(new string[] { "--verbosity", "diag" },
47-
new string[] { "--verbosity:diag" })]
47+
new string[] { "--verbosity:diagnostic" })]
4848
[InlineData(new string[] { "--disable-build-servers" },
4949
new string[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
5050
public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditionalArgs)

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetMSBuildInvocation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
88
[Collection(TestConstants.UsesStaticTelemetryState)]
99
public class GivenDotnetMSBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>
1010
{
11-
private static readonly string[] ExpectedPrefix = [ "-maxcpucount", "--verbosity:m", "-tlp:default=auto" ];
11+
private static readonly string[] ExpectedPrefix = [ "-maxcpucount", "--verbosity:minimal", "-tlp:default=auto" ];
1212
private static readonly string WorkingDirectory = TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetPackInvocation));
1313

1414
[Theory]

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetOsArchOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public GivenDotnetOsArchOptions(ITestOutputHelper log) : base(log)
1414
{
1515
}
1616

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"];
1818
private const string NugetInteractiveProperty = "--property:NuGetInteractive=false";
1919
private static readonly string[] DefaultArgs = ["-restore", "-consoleloggerparameters:Summary", NugetInteractiveProperty];
2020

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPackInvocation.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
88
[Collection(TestConstants.UsesStaticTelemetryState)]
99
public class GivenDotnetPackInvocation : IClassFixture<NullCurrentSessionIdFixture>
1010
{
11-
private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "-restore", "--target:Pack"];
12-
private static readonly string[] ExpectedNoBuildPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:Pack"];
11+
private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "-restore", "--target:Pack"];
12+
private static readonly string[] ExpectedNoBuildPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--target:Pack"];
1313
private readonly string[] ExpectedProperties = ["--property:_IsPacking=true", "--property:NuGetInteractive=false"];
1414

1515
private static readonly string WorkingDirectory =
@@ -28,8 +28,8 @@ public class GivenDotnetPackInvocation : IClassFixture<NullCurrentSessionIdFixtu
2828
[InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, new string[] { "--property:VersionSuffix=<versionsuffix>" })]
2929
[InlineData(new string[] { "-s" }, new string[] { "--property:Serviceable=true" })]
3030
[InlineData(new string[] { "--serviceable" }, new string[] { "--property:Serviceable=true" })]
31-
[InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diag" })]
32-
[InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diag" })]
31+
[InlineData(new string[] { "-v", "diag" }, new string[] { "--verbosity:diagnostic" })]
32+
[InlineData(new string[] { "--verbosity", "diag" }, new string[] { "--verbosity:diagnostic" })]
3333
[InlineData(new string[] { "<project>" }, new string[] { "<project>" })]
3434
[InlineData(new string[] { "--disable-build-servers" }, new string[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
3535
public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditionalArgs)

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output)
1717
this.output = output;
1818
}
1919

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"];
2121
private static readonly string[] ExpectedProperties = ["--property:_IsPublishing=true"];
2222
private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";
2323

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
99
[Collection(TestConstants.UsesStaticTelemetryState)]
1010
public class GivenDotnetRestoreInvocation : IClassFixture<NullCurrentSessionIdFixture>
1111
{
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"];
1313
private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";
1414
private static readonly string WorkingDirectory =
1515
TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetRestoreInvocation));

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
88
[Collection(TestConstants.UsesStaticTelemetryState)]
99
public class GivenDotnetStoreInvocation : IClassFixture<NullCurrentSessionIdFixture>
1010
{
11-
string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:ComposeStore", "<project>"];
11+
string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:minimal", "-tlp:default=auto", "--nologo", "--target:ComposeStore", "<project>"];
1212
static readonly string[] ArgsPrefix = ["--manifest", "<project>"];
1313
private static readonly string WorkingDirectory =
1414
TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetStoreInvocation));

0 commit comments

Comments
 (0)