Skip to content

Commit f0a51e6

Browse files
authored
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#44031)
2 parents a359a4c + b316e49 commit f0a51e6

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void WhenRunOnWindowsDotnetHelpCommandShouldContainProperProcessInformati
130130
public void WhenRunOnLinuxDotnetHelpCommandShouldContainProperProcessInformation()
131131
{
132132
var proc = HelpCommand.ConfigureProcess("https://aka.ms/dotnet-build");
133-
Assert.Equal("xdg-open", proc.StartInfo.FileName);
133+
Assert.Contains("xdg-open", proc.StartInfo.FileName);
134134
Assert.Equal("https://aka.ms/dotnet-build", proc.StartInfo.Arguments);
135135

136136
}

src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
103103
.StartWith(firstTimeNonVerbUseMessage);
104104
}
105105

106-
[WindowsOnlyFact]
106+
[WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
107107
public void ItShowsTheAppropriateMessageToTheUser()
108108
{
109109

@@ -151,7 +151,7 @@ public void ItDoesNotCreateAFirstUseSentinelFileNorAnAspNetCertificateSentinelFi
151151
homeFolder.Should().NotExist();
152152
}
153153

154-
[WindowsOnlyFact]
154+
[WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
155155
public void ItShowsTheTelemetryNoticeWhenInvokingACommandAfterInternalReportInstallSuccessHasBeenInvoked()
156156
{
157157
var dotnetFirstTime = new DotNetFirstTime();

src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ public void When_dotnet_command_invokes_msbuild_with_diag_verbosity_Then_arg_is_
6060

6161
var cmd = new DotnetCommand(Log)
6262
.WithWorkingDirectory(testInstance.Path)
63+
.WithEnvironmentVariable("HelixAccessToken", "")
64+
.WithEnvironmentVariable("SYSTEM_ACCESSTOKEN", "")
6365
.Execute(command, "-v", "diag");
6466

6567
cmd.Should().Pass();

0 commit comments

Comments
 (0)