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 c44e8e03a90e..7af6a2137b7c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -49,8 +49,8 @@ public async Task VerifyScenario(DotNetTemplate template) string projectDirectory = DotNetHelper.ExecuteNew(templateName, projectName); (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( - Path.Combine(OmniSharpDirectory, "run"), - $"-s {projectDirectory}", + DotNetHelper.DotNetPath, + $"{Path.Combine(OmniSharpDirectory, "OmniSharp.dll")} -- -s {projectDirectory}", OutputHelper, logOutput: true, millisecondTimeout: 5000, @@ -59,6 +59,8 @@ public async Task VerifyScenario(DotNetTemplate template) Assert.NotEqual(0, executeResult.Process.ExitCode); Assert.DoesNotContain("ERROR", executeResult.StdOut); Assert.DoesNotContain("ERROR", executeResult.StdErr); + Assert.DoesNotContain("command not found", executeResult.StdErr, StringComparison.OrdinalIgnoreCase); + Assert.DoesNotContain("No such file or directory", executeResult.StdErr, StringComparison.OrdinalIgnoreCase); } private async Task InitializeOmniSharp() @@ -66,7 +68,7 @@ private async Task InitializeOmniSharp() if (!Directory.Exists(OmniSharpDirectory)) { using HttpClient client = new(); - string omniSharpTarballFile = $"omnisharp-linux-{Config.TargetArchitecture}.tar.gz"; + string omniSharpTarballFile = $"omnisharp-linux-{Config.TargetArchitecture}-net6.0.tar.gz"; Uri omniSharpTarballUrl = new($"https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v{OmniSharpReleaseVersion}/{omniSharpTarballFile}"); await client.DownloadFileAsync(omniSharpTarballUrl, omniSharpTarballFile, OutputHelper);