diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs index b92d0263a..c97fb90c3 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs @@ -19,7 +19,7 @@ public class DotNetFormatTests : SmokeTests /// /// Format an unformatted project and verify that the output matches the pre-computed solution. /// - //[Fact] - Re-enable once https://github.com/dotnet/sdk/issues/27332 is resolved. Tracking - https://github.com/dotnet/source-build/issues/3004 + [Fact] public void FormatProject() { string unformattedCsFilePath = Path.Combine(BaselineHelper.GetAssetsDirectory(), UnformattedFileName); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index 8e8f2521d..2867269a5 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -126,7 +126,7 @@ internal class DotNetHelper } } - public static void ConfigureProcess(Process process, string? workingDirectory, bool setPath = false) + public static void ConfigureProcess(Process process, string? workingDirectory) { if (workingDirectory != null) { @@ -137,11 +137,7 @@ internal class DotNetHelper process.StartInfo.EnvironmentVariables["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; process.StartInfo.EnvironmentVariables["DOTNET_ROOT"] = Config.DotNetDirectory; process.StartInfo.EnvironmentVariables["NUGET_PACKAGES"] = PackagesDirectory; - - if (setPath) - { - process.StartInfo.EnvironmentVariables["PATH"] = $"{Config.DotNetDirectory}:{Environment.GetEnvironmentVariable("PATH")}"; - } + process.StartInfo.EnvironmentVariables["PATH"] = $"{Config.DotNetDirectory}:{Environment.GetEnvironmentVariable("PATH")}"; } public void ExecuteBuild(string projectName) => diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 84097a8da..60b444136 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -51,7 +51,7 @@ public class OmniSharpTests : SmokeTests OutputHelper, logOutput: true, millisecondTimeout: 5000, - configureCallback: (process) => DotNetHelper.ConfigureProcess(process, projectDirectory, setPath: true)); + configureCallback: (process) => DotNetHelper.ConfigureProcess(process, projectDirectory)); Assert.NotEqual(0, executeResult.Process.ExitCode); Assert.DoesNotContain("ERROR", executeResult.StdOut);