[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#44031)

dotnet · Oct 9, 2024 · f0a51e6 · f0a51e6
2 parents a359a4c + b316e49
commit f0a51e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
@@ -130,7 +130,7 @@ public void WhenRunOnWindowsDotnetHelpCommandShouldContainProperProcessInformati
         public void WhenRunOnLinuxDotnetHelpCommandShouldContainProperProcessInformation()
         {
             var proc = HelpCommand.ConfigureProcess("https://aka.ms/dotnet-build");
-            Assert.Equal("xdg-open", proc.StartInfo.FileName);
+            Assert.Contains("xdg-open", proc.StartInfo.FileName);
             Assert.Equal("https://aka.ms/dotnet-build", proc.StartInfo.Arguments);
 
         }

diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
@@ -103,7 +103,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
                 .StartWith(firstTimeNonVerbUseMessage);
         }
 
-        [WindowsOnlyFact]
+        [WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
         public void ItShowsTheAppropriateMessageToTheUser()
         {
 
@@ -151,7 +151,7 @@ public void ItDoesNotCreateAFirstUseSentinelFileNorAnAspNetCertificateSentinelFi
             homeFolder.Should().NotExist();
         }
 
-        [WindowsOnlyFact]
+        [WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
         public void ItShowsTheTelemetryNoticeWhenInvokingACommandAfterInternalReportInstallSuccessHasBeenInvoked()
         {
             var dotnetFirstTime = new DotNetFirstTime();

diff --git a/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs b/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs
@@ -60,6 +60,8 @@ public void When_dotnet_command_invokes_msbuild_with_diag_verbosity_Then_arg_is_
 
             var cmd = new DotnetCommand(Log)
                 .WithWorkingDirectory(testInstance.Path)
+                .WithEnvironmentVariable("HelixAccessToken", "")
+                .WithEnvironmentVariable("SYSTEM_ACCESSTOKEN", "")
                 .Execute(command, "-v", "diag");
 
             cmd.Should().Pass();